summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2019-05-15 20:04:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-15 20:04:23 +0000
commitf7bd8eeac310d0476dfe21be70222254112deb7c (patch)
treef998b78b5ca08a00a560d7574e84af23490850ca
parent2365e13575aa36f3365aecd8e212f876c2dece34 (diff)
parentaf2d439080b20313e3d87c45a949978c7de46cef (diff)
downloadcar-f7bd8eeac310d0476dfe21be70222254112deb7c.tar.gz
Merge "Update broadcastradio HAL instance names" into qt-dev
-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>