| commit | 2329b205e8ae00217b022826c926c74b607c8795 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Jan 17 12:06:29 2025 -0800 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Fri Jan 17 12:06:29 2025 -0800 |
| tree | d58e725ed501e5e536790ba9c0a51e43e9a81e39 | |
| parent | dd54edac0aced53cdbd86ec37b6cf9aaf94e2fef [diff] |
Revert^2 "Add SPEAKER_CLEANUP system usage" 4a7600084b8e7f45ba9c1791b1936d66a2d5434b (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2dd50bc4869e0d07eb8c0ce5b0f1bc75248c5227) Merged-In: Ib62dd0b43f5bd8f04c901b8afbdc80b544149906 Change-Id: Ib62dd0b43f5bd8f04c901b8afbdc80b544149906
diff --git a/audio/aidl/default/config/audioPolicy/engine/api/current.txt b/audio/aidl/default/config/audioPolicy/engine/api/current.txt index 017362f..41cfb44 100644 --- a/audio/aidl/default/config/audioPolicy/engine/api/current.txt +++ b/audio/aidl/default/config/audioPolicy/engine/api/current.txt
@@ -266,6 +266,7 @@ enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION_EVENT; enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_NOTIFICATION_TELEPHONY_RINGTONE; enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_SAFETY; + enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_SPEAKER_CLEANUP; enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_UNKNOWN; enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VEHICLE_STATUS; enum_constant public static final android.audio.policy.engine.configuration.UsageEnumType AUDIO_USAGE_VIRTUAL_SOURCE;
diff --git a/audio/aidl/default/config/audioPolicy/engine/audio_policy_engine_configuration.xsd b/audio/aidl/default/config/audioPolicy/engine/audio_policy_engine_configuration.xsd index cfd99eb..02250c7 100644 --- a/audio/aidl/default/config/audioPolicy/engine/audio_policy_engine_configuration.xsd +++ b/audio/aidl/default/config/audioPolicy/engine/audio_policy_engine_configuration.xsd
@@ -376,6 +376,7 @@ <xs:enumeration value="AUDIO_USAGE_SAFETY" /> <xs:enumeration value="AUDIO_USAGE_VEHICLE_STATUS" /> <xs:enumeration value="AUDIO_USAGE_ANNOUNCEMENT" /> + <xs:enumeration value="AUDIO_USAGE_SPEAKER_CLEANUP" /> </xs:restriction> </xs:simpleType>