diff options
| author | Oscar Azucena <oscarazu@google.com> | 2020-02-21 12:15:42 -0800 |
|---|---|---|
| committer | Oscar Azucena <oscarazu@google.com> | 2020-03-02 19:10:13 -0800 |
| commit | ec446abd4003553a5cbe55a8a069d90c6cb63760 (patch) | |
| tree | 233ad6a07c1120f018661780a7d9f7cba6370e6d /emulator | |
| parent | 874a7f8d3f8fb8c473a0a95c82abf2754e5143be (diff) | |
| download | device_generic_car-ec446abd4003553a5cbe55a8a069d90c6cb63760.tar.gz device_generic_car-ec446abd4003553a5cbe55a8a069d90c6cb63760.tar.bz2 device_generic_car-ec446abd4003553a5cbe55a8a069d90c6cb63760.zip | |
Updated car emulator audio configuration
Updated car emulator target car_audio_configuration.xml file to version
2. The new version requires audioZoneId be defined in all zones except
for primary zone. Also Added occupantZoneId to primary zone. Other
targets, like multi-display, should be updated independently as the
number of occupants will vary in those files.
Bug: 148292262
Test: lunch gcar_hl_md_emu_x86-userdebug, m -j
Test: emulator -skin 1280x720 -verbose -show-kernel -selinux permissive
-no-snapstorage -no-cache -prop ro.aae.simulateMultiZoneAudio=true
-prop aae.playZoneId=2
Test: atest CarAudioZonesHelperTest
Test: atest CarAudioZoneTest
Test: atest CarOccupantZoneServiceTest
Change-Id: If04c01a9b803ed41ee3fbb0e6c85f090c14f7c7e
Merged-In: If04c01a9b803ed41ee3fbb0e6c85f090c14f7c7e
(cherry picked from commit 2ebc17563fc31002386f7fcb3c918559d43ce9b8)
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/audio/car_audio_configuration.xml | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/emulator/audio/car_audio_configuration.xml b/emulator/audio/car_audio_configuration.xml index a819e06..2305395 100644 --- a/emulator/audio/car_audio_configuration.xml +++ b/emulator/audio/car_audio_configuration.xml @@ -22,9 +22,9 @@ - Volume groups in the car environment. --> -<carAudioConfiguration version="1"> +<carAudioConfiguration version="2"> <zones> - <zone name="primary zone" isPrimary="true"> + <zone name="primary zone" isPrimary="true" occupantZoneId="0"> <volumeGroups> <group> <device address="bus0_media_out"> @@ -38,6 +38,10 @@ </device> <device address="bus7_system_sound_out"> <context context="system_sound"/> + <context context="emergency"/> + <context context="safety"/> + <context context="vehicle_status"/> + <context context="announcement"/> </device> </group> <group> @@ -70,7 +74,7 @@ where port is the physical port of the display (See DisplayAddress.Phyisical) --> </zone> - <zone name="rear seat zone 1"> + <zone name="rear seat zone 1" audioZoneId="1"> <volumeGroups> <group> <device address="bus100_left_rear_seat_1"> @@ -82,6 +86,10 @@ <context context="alarm"/> <context context="notification"/> <context context="system_sound"/> + <context context="emergency"/> + <context context="safety"/> + <context context="vehicle_status"/> + <context context="announcement"/> </device> </group> </volumeGroups> @@ -89,7 +97,7 @@ <display port="1"/> </displays> </zone> - <zone name="rear seat zone 2"> + <zone name="rear seat zone 2" audioZoneId="2"> <volumeGroups> <group> <device address="bus200_right_rear_seat_2"> @@ -101,6 +109,10 @@ <context context="alarm"/> <context context="notification"/> <context context="system_sound"/> + <context context="emergency"/> + <context context="safety"/> + <context context="vehicle_status"/> + <context context="announcement"/> </device> </group> </volumeGroups> |