Skip to content

Commit 7ed70a8

Browse files
Mikhail NaganovGerrit Code Review
Mikhail Naganov
authored and
Gerrit Code Review
committed
Merge changes from topic "upstream-hal-v7_1-p4"
* changes: audio VTS: Fix HAL device management Make AUDIO_USAGE_NOTIFICATION_EVENT available to HALs audio: Add android.hardware.audio[.common]@7.1-util modules audio: add Ultrasound materials to 7.1
2 parents 13eaedc + e621407 commit 7ed70a8

File tree

14 files changed

+256
-77
lines changed

14 files changed

+256
-77
lines changed

‎audio/7.1/config/api/current.txt

+5
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ package android.audio.policy.configuration.V7_1 {
8686
enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_MUSIC;
8787
enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SONIFICATION;
8888
enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_SPEECH;
89+
enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_ULTRASOUND;
8990
enum_constant public static final android.audio.policy.configuration.V7_1.AudioContentType AUDIO_CONTENT_TYPE_UNKNOWN;
9091
}
9192

@@ -273,6 +274,7 @@ package android.audio.policy.configuration.V7_1 {
273274
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_MMAP_NOIRQ;
274275
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_RAW;
275276
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_SYNC;
277+
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_ULTRASOUND;
276278
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_INPUT_FLAG_VOIP_TX;
277279
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD;
278280
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_DEEP_BUFFER;
@@ -290,6 +292,7 @@ package android.audio.policy.configuration.V7_1 {
290292
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SPATIALIZER;
291293
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_SYNC;
292294
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_TTS;
295+
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_ULTRASOUND;
293296
enum_constant public static final android.audio.policy.configuration.V7_1.AudioInOutFlag AUDIO_OUTPUT_FLAG_VOIP_RX;
294297
}
295298

@@ -314,6 +317,7 @@ package android.audio.policy.configuration.V7_1 {
314317
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_HOTWORD;
315318
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_MIC;
316319
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_REMOTE_SUBMIX;
320+
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_ULTRASOUND;
317321
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_UNPROCESSED;
318322
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_CALL;
319323
enum_constant public static final android.audio.policy.configuration.V7_1.AudioSource AUDIO_SOURCE_VOICE_COMMUNICATION;
@@ -355,6 +359,7 @@ package android.audio.policy.configuration.V7_1 {
355359
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_GAME;
356360
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_MEDIA;
357361
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION;
362+
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_EVENT;
358363
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE;
359364
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_SAFETY;
360365
enum_constant public static final android.audio.policy.configuration.V7_1.AudioUsage AUDIO_USAGE_UNKNOWN;

‎audio/7.1/config/audio_policy_configuration.xsd

+5
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@
180180
<xs:enumeration value="AUDIO_OUTPUT_FLAG_INCALL_MUSIC" />
181181
<xs:enumeration value="AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD" />
182182
<xs:enumeration value="AUDIO_OUTPUT_FLAG_SPATIALIZER" />
183+
<xs:enumeration value="AUDIO_OUTPUT_FLAG_ULTRASOUND" />
183184
<xs:enumeration value="AUDIO_INPUT_FLAG_FAST" />
184185
<xs:enumeration value="AUDIO_INPUT_FLAG_HW_HOTWORD" />
185186
<xs:enumeration value="AUDIO_INPUT_FLAG_RAW" />
@@ -188,6 +189,7 @@
188189
<xs:enumeration value="AUDIO_INPUT_FLAG_VOIP_TX" />
189190
<xs:enumeration value="AUDIO_INPUT_FLAG_HW_AV_SYNC" />
190191
<xs:enumeration value="AUDIO_INPUT_FLAG_DIRECT" />
192+
<xs:enumeration value="AUDIO_INPUT_FLAG_ULTRASOUND" />
191193
</xs:restriction>
192194
</xs:simpleType>
193195
<xs:simpleType name="audioInOutFlags">
@@ -441,6 +443,7 @@
441443
<xs:enumeration value="AUDIO_USAGE_ALARM" />
442444
<xs:enumeration value="AUDIO_USAGE_NOTIFICATION" />
443445
<xs:enumeration value="AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE" />
446+
<xs:enumeration value="AUDIO_USAGE_NOTIFICATION_EVENT" />
444447
<xs:enumeration value="AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY" />
445448
<xs:enumeration value="AUDIO_USAGE_ASSISTANCE_NAVIGATION_GUIDANCE" />
446449
<xs:enumeration value="AUDIO_USAGE_ASSISTANCE_SONIFICATION" />
@@ -471,6 +474,7 @@
471474
<xs:enumeration value="AUDIO_CONTENT_TYPE_MUSIC"/>
472475
<xs:enumeration value="AUDIO_CONTENT_TYPE_MOVIE"/>
473476
<xs:enumeration value="AUDIO_CONTENT_TYPE_SONIFICATION"/>
477+
<xs:enumeration value="AUDIO_CONTENT_TYPE_ULTRASOUND"/>
474478
</xs:restriction>
475479
</xs:simpleType>
476480
<xs:simpleType name="samplingRates">
@@ -742,6 +746,7 @@
742746
<xs:enumeration value="AUDIO_SOURCE_ECHO_REFERENCE"/>
743747
<xs:enumeration value="AUDIO_SOURCE_FM_TUNER"/>
744748
<xs:enumeration value="AUDIO_SOURCE_HOTWORD"/>
749+
<xs:enumeration value="AUDIO_SOURCE_ULTRASOUND"/>
745750
</xs:restriction>
746751
</xs:simpleType>
747752
<!-- Enum values of device_category from Volume.h. -->

‎audio/common/all-versions/default/7.0/HidlUtils.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,12 @@ status_t HidlUtils::audioGainToHal(const AudioGain& gain, struct audio_gain* hal
485485
status_t HidlUtils::audioUsageFromHal(audio_usage_t halUsage, AudioUsage* usage) {
486486
if (halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_REQUEST ||
487487
halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_INSTANT ||
488+
#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
489+
halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED) {
490+
#else
488491
halUsage == AUDIO_USAGE_NOTIFICATION_COMMUNICATION_DELAYED ||
489492
halUsage == AUDIO_USAGE_NOTIFICATION_EVENT) {
493+
#endif
490494
halUsage = AUDIO_USAGE_NOTIFICATION;
491495
}
492496
*usage = audio_usage_to_string(halUsage);

‎audio/common/all-versions/default/Android.bp

+54
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,28 @@ cc_library {
157157
],
158158
}
159159

160+
cc_library {
161+
name: "[email protected]",
162+
defaults: ["android.hardware.audio.common-util_default"],
163+
srcs: [
164+
"7.0/HidlUtils.cpp",
165+
"HidlUtilsCommon.cpp",
166+
"UuidUtils.cpp",
167+
],
168+
shared_libs: [
169+
"[email protected]",
170+
"[email protected]",
171+
"libbase",
172+
],
173+
cflags: [
174+
"-DMAJOR_VERSION=7",
175+
"-DMINOR_VERSION=1",
176+
"-DCOMMON_TYPES_MINOR_VERSION=0",
177+
"-DCORE_TYPES_MINOR_VERSION=0",
178+
"-include common/all-versions/VersionMacro.h",
179+
],
180+
}
181+
160182
// Note: this isn't a VTS test, but rather a unit test
161183
// to verify correctness of conversion utilities.
162184
cc_test {
@@ -214,3 +236,35 @@ cc_test {
214236

215237
test_suites: ["device-tests"],
216238
}
239+
240+
cc_test {
241+
name: "[email protected]_tests",
242+
defaults: ["android.hardware.audio.common-util_default"],
243+
244+
srcs: ["tests/hidlutils_tests.cpp"],
245+
246+
// Use static linking to allow running in presubmit on
247+
// targets that don't have HAL V7.1.
248+
static_libs: [
249+
"[email protected]",
250+
"[email protected]",
251+
"[email protected]",
252+
],
253+
254+
shared_libs: [
255+
"libbase",
256+
"libxml2",
257+
],
258+
259+
cflags: [
260+
"-Werror",
261+
"-Wall",
262+
"-DMAJOR_VERSION=7",
263+
"-DMINOR_VERSION=1",
264+
"-DCOMMON_TYPES_MINOR_VERSION=0",
265+
"-DCORE_TYPES_MINOR_VERSION=0",
266+
"-include common/all-versions/VersionMacro.h",
267+
],
268+
269+
test_suites: ["device-tests"],
270+
}

‎audio/common/all-versions/default/HidlUtilsCommon.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace android {
2020
namespace hardware {
2121
namespace audio {
2222
namespace common {
23-
namespace CPP_VERSION {
23+
namespace COMMON_TYPES_CPP_VERSION {
2424
namespace implementation {
2525

2626
status_t HidlUtils::audioPortConfigsFromHal(unsigned int numHalConfigs,
@@ -51,7 +51,7 @@ status_t HidlUtils::audioPortConfigsToHal(const hidl_vec<AudioPortConfig>& confi
5151
}
5252

5353
} // namespace implementation
54-
} // namespace CPP_VERSION
54+
} // namespace COMMON_TYPES_CPP_VERSION
5555
} // namespace common
5656
} // namespace audio
5757
} // namespace hardware

‎audio/common/all-versions/default/TEST_MAPPING

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
},
66
{
77
"name": "[email protected]_tests"
8+
},
9+
{
10+
"name": "[email protected]_tests"
811
}
912
]
1013
}

‎audio/common/all-versions/default/tests/hidlutils_tests.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <log/log.h>
2424

2525
#include <HidlUtils.h>
26-
#include <android_audio_policy_configuration_V7_0-enums.h>
26+
#include PATH(APM_XSD_ENUMS_H_FILENAME)
2727
#include <system/audio.h>
2828
#include <xsdc/XsdcSupport.h>
2929

@@ -32,7 +32,7 @@ using ::android::hardware::hidl_vec;
3232
using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION;
3333
using ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION::implementation::HidlUtils;
3434
namespace xsd {
35-
using namespace ::android::audio::policy::configuration::V7_0;
35+
using namespace ::android::audio::policy::configuration::CPP_VERSION;
3636
}
3737

3838
static constexpr audio_channel_mask_t kInvalidHalChannelMask = AUDIO_CHANNEL_INVALID;

‎audio/core/all-versions/default/Android.bp

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ cc_defaults {
168168
shared_libs: [
169169
"[email protected]",
170170
"[email protected]",
171-
"android.hardware.audio@7.0-util",
171+
"android.hardware.audio@7.1-util",
172172
"[email protected]",
173173
"[email protected]",
174-
"android.hardware.audio.common@7.0-util",
174+
"android.hardware.audio.common@7.1-util",
175175
"libbase",
176176
],
177177
cflags: [

‎audio/core/all-versions/default/TEST_MAPPING

+3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
{
44
"name": "[email protected]_tests"
55
},
6+
{
7+
"name": "[email protected]_tests"
8+
},
69
{
710
"name": "HalAudioV6_0GeneratorTest"
811
},

‎audio/core/all-versions/default/util/Android.bp

+53
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,25 @@ cc_library {
112112
],
113113
}
114114

115+
cc_library {
116+
name: "[email protected]",
117+
defaults: ["android.hardware.audio-util_default"],
118+
shared_libs: [
119+
"[email protected]",
120+
"[email protected]",
121+
"[email protected]",
122+
"[email protected]",
123+
"libbase",
124+
],
125+
cflags: [
126+
"-DMAJOR_VERSION=7",
127+
"-DMINOR_VERSION=1",
128+
"-DCOMMON_TYPES_MINOR_VERSION=0",
129+
"-DCORE_TYPES_MINOR_VERSION=0",
130+
"-include common/all-versions/VersionMacro.h",
131+
],
132+
}
133+
115134
// Note: this isn't a VTS test, but rather a unit test
116135
// to verify correctness of conversion utilities.
117136
cc_test {
@@ -145,3 +164,37 @@ cc_test {
145164

146165
test_suites: ["device-tests"],
147166
}
167+
168+
cc_test {
169+
name: "[email protected]_tests",
170+
defaults: ["android.hardware.audio-util_default"],
171+
172+
srcs: ["tests/coreutils_tests.cpp"],
173+
174+
// Use static linking to allow running in presubmit on
175+
// targets that don't have HAL V7.1.
176+
static_libs: [
177+
"[email protected]",
178+
"[email protected]",
179+
"[email protected]",
180+
"[email protected]",
181+
"[email protected]",
182+
],
183+
184+
shared_libs: [
185+
"libbase",
186+
"libxml2",
187+
],
188+
189+
cflags: [
190+
"-Werror",
191+
"-Wall",
192+
"-DMAJOR_VERSION=7",
193+
"-DMINOR_VERSION=1",
194+
"-DCOMMON_TYPES_MINOR_VERSION=0",
195+
"-DCORE_TYPES_MINOR_VERSION=0",
196+
"-include common/all-versions/VersionMacro.h",
197+
],
198+
199+
test_suites: ["device-tests"],
200+
}

‎audio/core/all-versions/default/util/tests/coreutils_tests.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
#define LOG_TAG "CoreUtils_Test"
2323
#include <log/log.h>
2424

25-
#include <android_audio_policy_configuration_V7_0-enums.h>
25+
#include PATH(APM_XSD_ENUMS_H_FILENAME)
2626
#include <system/audio.h>
2727
#include <util/CoreUtils.h>
2828
#include <xsdc/XsdcSupport.h>
2929

3030
using namespace android;
3131
using namespace ::android::hardware::audio::common::COMMON_TYPES_CPP_VERSION;
32-
using namespace ::android::hardware::audio::CPP_VERSION;
32+
using namespace ::android::hardware::audio::CORE_TYPES_CPP_VERSION;
3333
using ::android::hardware::hidl_vec;
34-
using ::android::hardware::audio::CPP_VERSION::implementation::CoreUtils;
34+
using ::android::hardware::audio::CORE_TYPES_CPP_VERSION::implementation::CoreUtils;
3535
namespace xsd {
36-
using namespace ::android::audio::policy::configuration::V7_0;
36+
using namespace ::android::audio::policy::configuration::CPP_VERSION;
3737
}
3838

3939
static constexpr audio_channel_mask_t kInvalidHalChannelMask = AUDIO_CHANNEL_INVALID;

‎audio/core/all-versions/vts/functional/4.0/AudioPrimaryHidlHalTest.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ TEST_P(AudioHidlTest, OpenPrimaryDeviceUsingGetDevice) {
2828
if (getDeviceName() != DeviceManager::kPrimaryDevice) {
2929
GTEST_SKIP() << "No primary device on this factory"; // returns
3030
}
31-
EXPECT_TRUE(
32-
DeviceManager::getInstance().reset(getFactoryName(), DeviceManager::kPrimaryDevice));
31+
EXPECT_TRUE(DeviceManager::getInstance().resetPrimary(getFactoryName()));
3332

3433
// Must use IDevicesFactory directly because DeviceManager always uses
3534
// the latest interfaces version and corresponding methods for opening

‎audio/core/all-versions/vts/functional/Android.bp

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ cc_test {
195195
"[email protected]",
196196
"[email protected]",
197197
"[email protected]",
198-
"android.hardware.audio.common@7.0-util",
198+
"android.hardware.audio.common@7.1-util",
199199
],
200200
cflags: [
201201
"-DMAJOR_VERSION=7",

0 commit comments

Comments
 (0)