diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-22 03:10:00 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-22 03:10:00 +0000 |
| commit | b39756233266438bfaad7a14bb6d460c3d0217fe (patch) | |
| tree | da0a56ee00f2f951df9c73398c41ef49e898fd8b | |
| parent | b4fb9a16c0409076159d037af610690ec376adfd (diff) | |
| parent | 22fb416ab10387302d02c9a25ce40dbff60b5f24 (diff) | |
| download | device_generic_car-android10-qpr1-d-release.tar.gz device_generic_car-android10-qpr1-d-release.tar.bz2 device_generic_car-android10-qpr1-d-release.zip | |
Snap for 5821595 from 22fb416ab10387302d02c9a25ce40dbff60b5f24 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r15android10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release
Change-Id: I4b61839cb389c686c979956552e099ec3a8416e8
| -rw-r--r-- | common/car.mk | 4 | ||||
| -rw-r--r-- | common/car_core_hardware.xml | 4 | ||||
| -rw-r--r-- | common/manifest.xml | 18 | ||||
| -rw-r--r-- | common/sepolicy/file_contexts | 2 |
4 files changed, 27 insertions, 1 deletions
diff --git a/common/car.mk b/common/car.mk index 4dff8f8..de0250a 100644 --- a/common/car.mk +++ b/common/car.mk @@ -64,4 +64,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/generic/car/common/manifest.xml:$(TARGET_COPY_OUT_VENDOR)/manifest.xml +# Car emulator specific sepolicy +BOARD_SEPOLICY_DIRS += \ + device/generic/car/common/sepolicy + $(call inherit-product, packages/services/Car/car_product/build/car.mk) diff --git a/common/car_core_hardware.xml b/common/car_core_hardware.xml index 7911cc0..b0d4f12 100644 --- a/common/car_core_hardware.xml +++ b/common/car_core_hardware.xml @@ -16,7 +16,6 @@ <!-- This is a copy of frameworks/native/data/etc/car_core_hardware.xml that is somewhat combined with device/generic/goldfish/data/etc/handheld_core_hardware.xml. - Notably bluetooth is removed since it does not work in the emulator. --> <!-- These are the hardware components that all handheld devices @@ -38,6 +37,9 @@ <feature name="android.hardware.touchscreen" /> <feature name="android.hardware.microphone" /> + <!-- Notably bluetooth is added to avoid crashing. It does not work in the emulator. --> + <feature name="android.hardware.bluetooth" /> + <!-- basic system services --> <feature name="android.software.connectionservice" /> <feature name="android.software.voice_recognizers" notLowRam="true" /> diff --git a/common/manifest.xml b/common/manifest.xml index 6e1f759..d7eaf2a 100644 --- a/common/manifest.xml +++ b/common/manifest.xml @@ -45,6 +45,24 @@ </interface> </hal> <hal format="hidl"> + <name>android.hardware.bluetooth</name> + <transport>hwbinder</transport> + <version>1.0</version> + <interface> + <name>IBluetoothHci</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> + <name>android.hardware.bluetooth.audio</name> + <transport>hwbinder</transport> + <version>2.0</version> + <interface> + <name>IBluetoothAudioProvidersFactory</name> + <instance>default</instance> + </interface> + </hal> + <hal format="hidl"> <name>android.hardware.audio</name> <transport>hwbinder</transport> <version>4.0</version> diff --git a/common/sepolicy/file_contexts b/common/sepolicy/file_contexts new file mode 100644 index 0000000..e3e07d2 --- /dev/null +++ b/common/sepolicy/file_contexts @@ -0,0 +1,2 @@ +# label the bluetooth@1.0-service.sim or it won't register during system boot +/vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service\.sim u:object_r:hal_bluetooth_default_exec:s0 |