summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-05 08:02:59 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-05 08:02:59 +0000
commitf0fcca1d20f30bddd988253df08a7a3ebf95562d (patch)
tree8e2616602e41fab9fc70e98d13e8768d85ce5a48
parent7df8b743556ef2953103b5d6a5946db93a2f2333 (diff)
parent46674d19ff4ae724c2521fd5016bd623fe24511d (diff)
downloaddevice_generic_car-f0fcca1d20f30bddd988253df08a7a3ebf95562d.tar.gz
device_generic_car-f0fcca1d20f30bddd988253df08a7a3ebf95562d.tar.bz2
device_generic_car-f0fcca1d20f30bddd988253df08a7a3ebf95562d.zip
Merge "Removed configs for car audio display API." into rvc-dev am: 46674d19ff
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/11714658 Change-Id: Ia1ecdd814cffa60e00c0625c1f005c6074617314
-rw-r--r--emulator/audio/car_audio_configuration.xml17
1 files changed, 0 insertions, 17 deletions
diff --git a/emulator/audio/car_audio_configuration.xml b/emulator/audio/car_audio_configuration.xml
index 3700def..d79ff33 100644
--- a/emulator/audio/car_audio_configuration.xml
+++ b/emulator/audio/car_audio_configuration.xml
@@ -17,7 +17,6 @@
<!--
Defines the audio configuration in a car, including
- Audio zones
- - Display to audio zone mappings
- Context to audio bus mappings
- Volume groups
in the car environment.
@@ -63,16 +62,6 @@
</device>
</group>
</volumeGroups>
- <displays>
- <display port="0"/>
- </displays>
- <!-- to specify displays associated with this audio zone, use the following tags
- <displays>
- <display port="1"/>
- <display port="2"/>
- </displays>
- where port is the physical port of the display (See DisplayAddress.Phyisical)
- -->
</zone>
<zone name="rear seat zone 1" audioZoneId="1">
<volumeGroups>
@@ -93,9 +82,6 @@
</device>
</group>
</volumeGroups>
- <displays>
- <display port="1"/>
- </displays>
</zone>
<zone name="rear seat zone 2" audioZoneId="2">
<volumeGroups>
@@ -116,9 +102,6 @@
</device>
</group>
</volumeGroups>
- <displays>
- <display port="2"/>
- </displays>
</zone>
</zones>
</carAudioConfiguration>