From 906e91433b7b849219d859dae6fe71f32d76c842 Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Fri, 11 May 2018 16:35:43 -0700 Subject: [PATCH] Adjust for QCOM BT HAL property name changes Bug: 36513925 Test: Manual Bluetooth test Change-Id: I492fde56b7f10395869ac32e8d6dd20268ce5230 --- device.mk | 14 ++++++++++---- init.hardware.diag.rc.userdebug | 12 ++++++------ sepolicy/vendor/property_contexts | 19 +++++++++---------- system.prop | 10 ---------- 4 files changed, 25 insertions(+), 30 deletions(-) diff --git a/device.mk b/device.mk index 4454eb3a..8690df31 100755 --- a/device.mk +++ b/device.mk @@ -345,9 +345,18 @@ PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-service-qti \ android.hardware.bluetooth@1.0-service-qti.rc +# Bluetooth SoC +PRODUCT_PROPERTY_OVERRIDES += \ + vendor.qcom.bluetooth.soc=cherokee + # Property for loading BDA from bdaddress module in kernel PRODUCT_PROPERTY_OVERRIDES += \ - ro.bt.bdaddr_path=/sys/module/bdaddress/parameters/bdaddress + ro.vendor.bt.bdaddr_path=/sys/module/bdaddress/parameters/bdaddress + +# Bluetooth WiPower +PRODUCT_PROPERTY_OVERRIDES += \ + ro.vendor.bluetooth.emb_wp_mode=false \ + ro.vendor.bluetooth.wipower=false # DRM HAL PRODUCT_PACKAGES += \ @@ -609,9 +618,6 @@ PRODUCT_ENFORCE_RRO_TARGETS := framework-res PRODUCT_PROPERTY_OVERRIDES += \ dalvik.vm.heapgrowthlimit=256m -PRODUCT_PROPERTY_OVERRIDES += \ - qcom.bluetooth.soc=cherokee - # Privileged permissions whitelist PRODUCT_COPY_FILES += \ device/google/wahoo/permissions/privapp-permissions-aosp_wahoo.xml:system/etc/permissions/privapp-permissions-aosp_wahoo.xml diff --git a/init.hardware.diag.rc.userdebug b/init.hardware.diag.rc.userdebug index 8db3cec6..6977fc63 100644 --- a/init.hardware.diag.rc.userdebug +++ b/init.hardware.diag.rc.userdebug @@ -80,18 +80,18 @@ on property:vendor.debug.ramdump.force_crash=true write /proc/sysrq-trigger "c" on property:sys.logger.bluetooth=true - setprop persist.service.bdroid.snooplog true - setprop persist.service.bdroid.fwsnoop true + setprop persist.vendor.service.bdroid.snooplog true + setprop persist.vendor.service.bdroid.fwsnoop true on property:sys.logger.bluetooth=false - setprop persist.service.bdroid.snooplog false - setprop persist.service.bdroid.fwsnoop false + setprop persist.vendor.service.bdroid.snooplog false + setprop persist.vendor.service.bdroid.fwsnoop false on property:persist.bluetooth.btsnoopenable=true - setprop persist.service.bdroid.soclog true + setprop persist.vendor.service.bdroid.soclog true on property:persist.bluetooth.btsnoopenable=false - setprop persist.service.bdroid.soclog false + setprop persist.vendor.service.bdroid.soclog false on property:vendor.usb.config=* start usbd diff --git a/sepolicy/vendor/property_contexts b/sepolicy/vendor/property_contexts index 69450233..a10b6762 100644 --- a/sepolicy/vendor/property_contexts +++ b/sepolicy/vendor/property_contexts @@ -191,16 +191,15 @@ persist.radio.VT_ENABLE u:object_r:vendor_radio_prop:s0 persist.radio.VT_HYBRID_ENABLE u:object_r:vendor_radio_prop:s0 # vendor_bluetooth_prop -persist.bluetooth.a4wp u:object_r:vendor_bluetooth_prop:s0 -persist.bluetooth.csoc.cnt u:object_r:vendor_bluetooth_prop:s0 -persist.service.bdroid.fwsnoop u:object_r:vendor_bluetooth_prop:s0 -persist.service.bdroid.sibs u:object_r:vendor_bluetooth_prop:s0 -persist.service.bdroid.snooplog u:object_r:vendor_bluetooth_prop:s0 -persist.service.bdroid.soclog u:object_r:vendor_bluetooth_prop:s0 -persist.service.bdroid.ssrlvl u:object_r:vendor_bluetooth_prop:s0 -ro.bluetooth.a4wp u:object_r:vendor_bluetooth_prop:s0 -ro.bluetooth.emb_wp_mode u:object_r:vendor_bluetooth_prop:s0 -ro.bluetooth.wipower u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.bluetooth.a4wp u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.bluetooth.csoc.cnt u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.service.bdroid.fwsnoop u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.service.bdroid.sibs u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.service.bdroid.snooplog u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.service.bdroid.soclog u:object_r:vendor_bluetooth_prop:s0 +persist.vendor.service.bdroid.ssrlvl u:object_r:vendor_bluetooth_prop:s0 +ro.vendor.bluetooth.emb_wp_mode u:object_r:vendor_bluetooth_prop:s0 +ro.vendor.bluetooth.wipower u:object_r:vendor_bluetooth_prop:s0 # persist_nfc_prop persist.nfc. u:object_r:persist_nfc_prop:s0 diff --git a/system.prop b/system.prop index 98af2088..20d70340 100644 --- a/system.prop +++ b/system.prop @@ -69,13 +69,3 @@ persist.data.df.dev_name=rmnet_usb0 #ro.use_data_netmgrd=true persist.data.netmgrd.qos.enable=true persist.data.mode=concurrent - -#system prop for A4WP profile support -ro.bluetooth.a4wp=false - -#system prop for wipower support -ro.bluetooth.emb_wp_mode=false -ro.bluetooth.wipower=false - -# Property for loading BDA from bdaddress module in kernel -ro.bt.bdaddr_path=/sys/module/bdaddress/parameters/bdaddress