summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-05-01 02:29:13 -0500
committerandroid-build-team Robot2018-05-01 02:29:13 -0500
commit714ac03d2d355037486eb1f37333cf7f8ffc551c (patch)
tree04837773e8d977a2c08babe003fb918ae5df1594
parent5eb24b785a1db274c4a6d328c1e97dca94e59c84 (diff)
parent14bdba8865098afc35515ef73c5f8fa3f9c860ec (diff)
downloadplatform-hardware-interfaces-714ac03d2d355037486eb1f37333cf7f8ffc551c.tar.gz
platform-hardware-interfaces-714ac03d2d355037486eb1f37333cf7f8ffc551c.tar.xz
platform-hardware-interfaces-714ac03d2d355037486eb1f37333cf7f8ffc551c.zip
Snap for 4754571 from 14bdba8865098afc35515ef73c5f8fa3f9c860ec to pi-release
Change-Id: Icfb51400a5d6f3a03a00e1e3636ec1af5e99a188
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h5
-rw-r--r--automotive/vehicle/2.0/types.hal13
-rw-r--r--broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp17
-rw-r--r--compatibility_matrices/Android.mk6
-rw-r--r--current.txt2
5 files changed, 23 insertions, 20 deletions
diff --git a/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
index 004a99ee..5828c3f3 100644
--- a/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/Conversions.impl.h
@@ -18,6 +18,8 @@
18 18
19#include <stdio.h> 19#include <stdio.h>
20 20
21#include <log/log.h>
22
21namespace android { 23namespace android {
22namespace hardware { 24namespace hardware {
23namespace audio { 25namespace audio {
@@ -108,6 +110,9 @@ AudioMicrophoneChannelMapping halToChannelMapping(audio_microphone_channel_mappi
108 return AudioMicrophoneChannelMapping::DIRECT; 110 return AudioMicrophoneChannelMapping::DIRECT;
109 case AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED: 111 case AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED:
110 return AudioMicrophoneChannelMapping::PROCESSED; 112 return AudioMicrophoneChannelMapping::PROCESSED;
113 default:
114 ALOGE("Invalid channel mapping type: %d", mapping);
115 return AudioMicrophoneChannelMapping::UNUSED;
111 } 116 }
112} 117}
113 118
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index d4e4d468..faa1adc7 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -966,19 +966,6 @@ enum VehicleProperty : int32_t {
966 | VehicleArea:GLOBAL), 966 | VehicleArea:GLOBAL),
967 967
968 /** 968 /**
969 * Cabin temperature
970 *
971 * @change_mode VehiclePropertyChangeMode:CONTINUOUS
972 * @access VehiclePropertyAccess:READ
973 * @unit VehicleUnit:CELSIUS
974 */
975 ENV_CABIN_TEMPERATURE = (
976 0x0704
977 | VehiclePropertyGroup:SYSTEM
978 | VehiclePropertyType:FLOAT
979 | VehicleArea:SEAT),
980
981 /**
982 * Property to control power state of application processor 969 * Property to control power state of application processor
983 * 970 *
984 * It is assumed that AP's power state is controller by separate power 971 * It is assumed that AP's power state is controller by separate power
diff --git a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
index 6877f074..571b80c7 100644
--- a/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
+++ b/broadcastradio/2.0/vts/functional/VtsHalBroadcastradioV2_0TargetTest.cpp
@@ -20,6 +20,7 @@
20 20
21#include <VtsHalHidlTargetTestBase.h> 21#include <VtsHalHidlTargetTestBase.h>
22#include <android-base/logging.h> 22#include <android-base/logging.h>
23#include <android-base/strings.h>
23#include <android/hardware/broadcastradio/2.0/IBroadcastRadio.h> 24#include <android/hardware/broadcastradio/2.0/IBroadcastRadio.h>
24#include <android/hardware/broadcastradio/2.0/ITunerCallback.h> 25#include <android/hardware/broadcastradio/2.0/ITunerCallback.h>
25#include <android/hardware/broadcastradio/2.0/ITunerSession.h> 26#include <android/hardware/broadcastradio/2.0/ITunerSession.h>
@@ -66,6 +67,8 @@ static constexpr auto programListScan = 5min;
66 67
67} // namespace timeout 68} // namespace timeout
68 69
70static constexpr auto gTuneWorkaround = 200ms;
71
69static const ConfigFlag gConfigFlagValues[] = { 72static const ConfigFlag gConfigFlagValues[] = {
70 ConfigFlag::FORCE_MONO, 73 ConfigFlag::FORCE_MONO,
71 ConfigFlag::FORCE_ANALOG, 74 ConfigFlag::FORCE_ANALOG,
@@ -158,6 +161,14 @@ Return<void> TunerCallbackMock::onCurrentProgramInfoChanged(const ProgramInfo& i
158 physically > IdentifierType::SXM_CHANNEL); 161 physically > IdentifierType::SXM_CHANNEL);
159 } 162 }
160 163
164 if (logically == IdentifierType::AMFM_FREQUENCY) {
165 auto ps = utils::getMetadataString(info, MetadataKey::RDS_PS);
166 if (ps.has_value()) {
167 EXPECT_NE("", android::base::Trim(*ps))
168 << "Don't use empty RDS_PS as an indicator of missing RSD PS data.";
169 }
170 }
171
161 return onCurrentProgramInfoChanged_(info); 172 return onCurrentProgramInfoChanged_(info);
162} 173}
163 174
@@ -414,7 +425,7 @@ TEST_F(BroadcastRadioHalTest, FmTune) {
414 * This sleep workaround will fix default implementation, but the real HW tests will still be 425 * This sleep workaround will fix default implementation, but the real HW tests will still be
415 * flaky. We probably need to implement egmock alternative based on actions. 426 * flaky. We probably need to implement egmock alternative based on actions.
416 */ 427 */
417 std::this_thread::sleep_for(100ms); 428 std::this_thread::sleep_for(gTuneWorkaround);
418 429
419 // try tuning 430 // try tuning
420 ProgramInfo infoCb = {}; 431 ProgramInfo infoCb = {};
@@ -500,7 +511,7 @@ TEST_F(BroadcastRadioHalTest, Scan) {
500 ASSERT_TRUE(openSession()); 511 ASSERT_TRUE(openSession());
501 512
502 // TODO(b/69958777): see FmTune workaround 513 // TODO(b/69958777): see FmTune workaround
503 std::this_thread::sleep_for(100ms); 514 std::this_thread::sleep_for(gTuneWorkaround);
504 515
505 EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_, _); 516 EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_, _);
506 auto result = mSession->scan(true /* up */, true /* skip subchannel */); 517 auto result = mSession->scan(true /* up */, true /* skip subchannel */);
@@ -525,7 +536,7 @@ TEST_F(BroadcastRadioHalTest, Step) {
525 ASSERT_TRUE(openSession()); 536 ASSERT_TRUE(openSession());
526 537
527 // TODO(b/69958777): see FmTune workaround 538 // TODO(b/69958777): see FmTune workaround
528 std::this_thread::sleep_for(100ms); 539 std::this_thread::sleep_for(gTuneWorkaround);
529 540
530 EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_, _).Times(AnyNumber()); 541 EXPECT_TIMEOUT_CALL(*mCallback, onCurrentProgramInfoChanged_, _).Times(AnyNumber());
531 auto result = mSession->step(true /* up */); 542 auto result = mSession->step(true /* up */);
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 9e48588e..8904c685 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -64,9 +64,9 @@ LOCAL_MODULE := framework_compatibility_matrix.3.xml
64LOCAL_MODULE_STEM := compatibility_matrix.3.xml 64LOCAL_MODULE_STEM := compatibility_matrix.3.xml
65LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 65LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
66LOCAL_KERNEL_CONFIG_DATA_PATHS := \ 66LOCAL_KERNEL_CONFIG_DATA_PATHS := \
67 4.4.0:$(my_kernel_config_data)/android-4.4 \ 67 4.4.0:$(my_kernel_config_data)/p/android-4.4 \
68 4.9.0:$(my_kernel_config_data)/android-4.9 \ 68 4.9.0:$(my_kernel_config_data)/p/android-4.9 \
69 4.14.0:$(my_kernel_config_data)/android-4.14 \ 69 4.14.0:$(my_kernel_config_data)/p/android-4.14 \
70 70
71include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 71include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
72 72
diff --git a/current.txt b/current.txt
index 36f19b7a..5ccd6abe 100644
--- a/current.txt
+++ b/current.txt
@@ -299,7 +299,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar
2993b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types 2993b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types
300b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle 300b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle
3017ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback 3017ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback
302962b18e414231b5f3930d63daba116347241b3606242b0606b3699ba25b14315 android.hardware.automotive.vehicle@2.0::types 3029cf9690f559f8425fa86e409137a42435ca225505152f03736ac8f3773ef4f89 android.hardware.automotive.vehicle@2.0::types
30332cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost 30332cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost
304ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload 304ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload
30527f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types 30527f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types