| commit | 5c7f8e4d80be29c958531336f16fcfb55d10651f | [log] [tgz] |
|---|---|---|
| author | Mikhail Naganov <mnaganov@google.com> | Fri Feb 05 23:30:35 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 05 23:30:35 2021 +0000 |
| tree | cc3d88aa4ee343623c16dea4789660b45a763d7c | |
| parent | ef9b9325046abec0176d3f124f46ebb890d35042 [diff] | |
| parent | 2f111c17d5b2cc1de8e9fe7ef4ae5c96e6830d87 [diff] |
audio: Update audioPolicyConfiguration version am: 8a52581b09 am: 2f111c17d5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1576844 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I895d34179a2d8e24413718cff42b890b9ce96b8e
diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index c1940e5..8fb8036 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt
@@ -544,7 +544,7 @@ public enum Version { method @NonNull public String getRawName(); - enum_constant public static final android.audio.policy.configuration.V7_0.Version _1_0; + enum_constant public static final android.audio.policy.configuration.V7_0.Version _7_0; } public class Volume {
diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 4d224c8..40dc6f2 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd
@@ -20,7 +20,7 @@ <!-- List the config versions supported by audio policy. --> <xs:simpleType name="version"> <xs:restriction base="xs:decimal"> - <xs:enumeration value="1.0"/> + <xs:enumeration value="7.0"/> </xs:restriction> </xs:simpleType> <xs:simpleType name="halVersion">
diff --git a/audio/7.0/config/update_audio_policy_config.sh b/audio/7.0/config/update_audio_policy_config.sh index 051a0df..159fa35 100755 --- a/audio/7.0/config/update_audio_policy_config.sh +++ b/audio/7.0/config/update_audio_policy_config.sh
@@ -113,6 +113,9 @@ echo "Press Ctrl-C to cancel, Enter to continue" read +# Update 'audioPolicyConfiguration version="1.0"' -> 7.0 in the main file +sed -i -r -e 's/(audioPolicyConfiguration version=")1.0/\17.0/' ${SOURCE_CONFIG} + updateFile() { FILE=$1 ATTR=$2