diff options
author | Hayden Gomes <haydengomes@google.com> | 2019-05-13 11:52:15 -0700 |
---|---|---|
committer | Hayden Gomes <haydengomes@google.com> | 2019-05-13 12:33:54 -0700 |
commit | 6443a42f41cb73339949620c34e02fda532357fd (patch) | |
tree | ea435d81b731a8cb7bbd58b08409d38e731a9722 | |
parent | d0d84e40116bee8d56f176f61e7e0195ab3eb818 (diff) | |
download | device_generic_car-6443a42f41cb73339949620c34e02fda532357fd.tar.gz device_generic_car-6443a42f41cb73339949620c34e02fda532357fd.tar.bz2 device_generic_car-6443a42f41cb73339949620c34e02fda532357fd.zip |
Remove incorrectly formatted display tags
The car_audio_configuration format has be updated to expect port=#
rather than name=string for display tags. As they are not currently used
on the emulator, we are simply removing them to enable things to boot
again.
Test: make -j and ran emulator to confirm it lauches
Bug: 132626851
Change-Id: Ia569776aae98d91188ccf5f6cb528755713f92f8
-rw-r--r-- | emulator/audio/car_audio_configuration.xml | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/emulator/audio/car_audio_configuration.xml b/emulator/audio/car_audio_configuration.xml index af88932..628d14a 100644 --- a/emulator/audio/car_audio_configuration.xml +++ b/emulator/audio/car_audio_configuration.xml @@ -59,9 +59,13 @@ </device> </group> </volumeGroups> - <displays> - <display display="primary_display"/> - </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"> <volumeGroups> @@ -78,9 +82,6 @@ </device> </group> </volumeGroups> - <displays> - <display display="rear_seat_display"/> - </displays> </zone> </zones> </carAudioConfiguration> |