Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a52581b authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Update audioPolicyConfiguration version 

HAL V7 uses spaces instead of ',' and '|' for delimiting
elements in channel masks, sample rates, and flags lists
in the Audio Policy Manager configuration XML.
The version specified in the APM XML has been updated
from '1.0' to '7.0' in order to reflect this.

The migration script has been updated to change the
version in the XML on update.

Bug: 142480271
Test: m
Change-Id: I92c206dddee6964fc2019fed80435cb8d69dbfe9
parent 37126523

audio/7.0/config/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

audio/7.0/config/audio_policy_configuration.xsd

+1 −1
Original line number Diff line number Diff line
@@ -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">

audio/7.0/config/update_audio_policy_config.sh

+3 −0
Original line number Diff line number Diff line
@@ -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