From b527e46aaaae61dc976f0be65363643e8821381d Mon Sep 17 00:00:00 2001 From: Patty Date: Wed, 15 Sep 2021 15:57:52 +0800 Subject: [PATCH] Include gs101 bluetooth sepolicy config Bug: 196308076 Test: boot with service btlinux started Change-Id: I922d19d9a3638fd264340499b2e7d68798db9151 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- device-slider.mk | 2 +- device-whitefin.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 9f4ac8c..d5dcd5d 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -33,6 +33,7 @@ include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk include hardware/google/pixel/vibrator/cs40l25/device.mk +include device/google/gs101/bluetooth/bluetooth.mk ifeq ($(filter factory_oriole, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk @@ -204,7 +205,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf # Override default distortion output gain according to UX experiments diff --git a/device-raven.mk b/device-raven.mk index 4c29b14..6df44ba 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -32,6 +32,7 @@ include device/google/raviole/audio/raven/audio-tables.mk include device/google/gs101/device-shipping-common.mk include device/google/gs101/fingerprint/udfps_common.mk include device/google/gs101/telephony/pktrouter.mk +include device/google/gs101/bluetooth/bluetooth.mk ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/fingerprint/udfps_shipping.mk @@ -210,7 +211,6 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf # Override default distortion output gain according to UX experiments diff --git a/device-slider.mk b/device-slider.mk index f3ac3f0..95e0542 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -27,6 +27,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/slider/overlay include device/google/gs101/device-common.mk include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk +include device/google/gs101/bluetooth/bluetooth.mk # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml @@ -104,5 +105,4 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts # Bluetooth HAL PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf diff --git a/device-whitefin.mk b/device-whitefin.mk index 444402f..3b84921 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -27,6 +27,7 @@ DEVICE_PACKAGE_OVERLAYS += device/google/raviole/whitefin/overlay include device/google/gs101/device-common.mk include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk +include device/google/gs101/bluetooth/bluetooth.mk # WirelessCharger DEVICE_PRODUCT_COMPATIBILITY_MATRIX_FILE += device/google/gs101/device_framework_matrix_product_wireless.xml @@ -85,5 +86,4 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/raviole/prebuilts # Bluetooth HAL PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.1-service.bcmbtlinux \ bt_vendor.conf