diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index c1940e5ad0..8fb8036ff8 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -544,7 +544,7 @@ package android.audio.policy.configuration.V7_0 { 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 4d224c8f07..40dc6f2c69 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -20,7 +20,7 @@ - + diff --git a/audio/7.0/config/update_audio_policy_config.sh b/audio/7.0/config/update_audio_policy_config.sh index 051a0df916..159fa35946 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 "Will update paths to shared included files." 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