summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Wasilczyk <twasilczyk@google.com>2019-05-15 13:12:46 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-15 13:12:46 -0700
commitc9ebd3ebb7ad74e3acf378d524225fe355585a21 (patch)
treef998b78b5ca08a00a560d7574e84af23490850ca
parent2365e13575aa36f3365aecd8e212f876c2dece34 (diff)
parentf7bd8eeac310d0476dfe21be70222254112deb7c (diff)
downloaddevice_generic_car-c9ebd3ebb7ad74e3acf378d524225fe355585a21.tar.gz
device_generic_car-c9ebd3ebb7ad74e3acf378d524225fe355585a21.tar.bz2
device_generic_car-c9ebd3ebb7ad74e3acf378d524225fe355585a21.zip
Merge "Update broadcastradio HAL instance names" into qt-dev
am: f7bd8eeac3 Change-Id: I9640ac955262c58aa2d33229a0b088ddb7acc095
-rw-r--r--common/manifest.xml3
-rw-r--r--emulator/hal/car_emulator_manifest.xml3
2 files changed, 4 insertions, 2 deletions
diff --git a/common/manifest.xml b/common/manifest.xml
index 2faa498..d61d03d 100644
--- a/common/manifest.xml
+++ b/common/manifest.xml
@@ -105,7 +105,8 @@
<version>2.0</version>
<interface>
<name>IBroadcastRadio</name>
- <instance>default</instance>
+ <instance>amfm</instance>
+ <instance>dab</instance>
</interface>
</hal>
<hal format="hidl">
diff --git a/emulator/hal/car_emulator_manifest.xml b/emulator/hal/car_emulator_manifest.xml
index 9ab23f7..e450a36 100644
--- a/emulator/hal/car_emulator_manifest.xml
+++ b/emulator/hal/car_emulator_manifest.xml
@@ -205,7 +205,8 @@
<version>2.0</version>
<interface>
<name>IBroadcastRadio</name>
- <instance>default</instance>
+ <instance>amfm</instance>
+ <instance>dab</instance>
</interface>
</hal>
<sepolicy>