From 11656dcc3774643f6be2c52ff026fdc202f82afa Mon Sep 17 00:00:00 2001
From: SzuWei Lin <szuweilin@google.com>
Date: Mon, 22 May 2017 18:18:33 +0800
Subject: [PATCH] Move bluetooth property to vendor

Property 'qcom.bluetooth.soc' is readed by driver.  Moves it to
vendor to use bluetooth on generic AOSP.

Bug: 37927875
Test: switch on/off bluetooth in settings
Change-Id: Ib4dd140b7e9f1b3d6cce098d8527bafcafcff950
---
 device.mk   | 3 +++
 system.prop | 6 ------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/device.mk b/device.mk
index e574c17f..95e91018 100755
--- a/device.mk
+++ b/device.mk
@@ -539,3 +539,6 @@ PRODUCT_ENFORCE_RRO_TARGETS := framework-res
 # Override heap growth limit due to high display density on device
 PRODUCT_PROPERTY_OVERRIDES += \
     dalvik.vm.heapgrowthlimit=256m
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    qcom.bluetooth.soc=cherokee
diff --git a/system.prop b/system.prop
index f7d1349e..9b7c6e30 100644
--- a/system.prop
+++ b/system.prop
@@ -51,9 +51,6 @@ telephony.lteOnCdmaDevice=1
 # Simulate sdcard on /data/media
 persist.fuse_sdcard=true
 
-# system prop for Bluetooth SOC type
-qcom.bluetooth.soc=cherokee
-
 # settings to enable Device Orientation Sensors
 ro.qti.sensors.dev_ori=true
 
@@ -90,9 +87,6 @@ persist.data.df.dev_name=rmnet_usb0
 persist.data.netmgrd.qos.enable=true
 persist.data.mode=concurrent
 
-#system prop for Bluetooth SOC type
-qcom.bluetooth.soc=cherokee
-
 #system prop for A4WP profile support
 ro.bluetooth.a4wp=false