Commit: 37976583c6d540054b2c450207773fc24ec7add0 - device-generic-common (git)

device/generic/common

Commit MetaInfo

• Revision: 37976583c6d540054b2c450207773fc24ec7add0 (tree)
• Time: 2016-10-12 23:23:54
• Author: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Merge remote-tracking branch 'x86/nougat-x86' into cm-14.0-x86

Change Summary

• modified: init.sh
• modified: init.x86.rc
• modified: packages.mk

Incremental Difference

--- a/init.sh
+++ b/init.sh
@@ -48,6 +48,7 @@ function init_hal_bluetooth()
 	case "$PRODUCT" in
 		T10*TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
+			set_property hal.bluetooth.uart.proto bcm
 			;;
 		MacBookPro8*)
 			rmmod b43
@@ -68,15 +69,13 @@ function init_hal_bluetooth()
 			for bt in $(lsusb -v | awk ' /Class:.E0/ { print $9 } '); do
 				chown 1002.1002 $bt && chmod 660 $bt
 			done
-			modprobe btusb
 			;;
 	esac
 
 	if [ -n "$BTUART_PORT" ]; then
 		set_property hal.bluetooth.uart $BTUART_PORT
 		chown bluetooth.bluetooth $BTUART_PORT
-		start btattach:-B$BTUART_PORT
-		log -t hciconfig -p i "`hciconfig`"
+		start btattach
 	fi
 }
 
@@ -405,16 +404,6 @@ function do_bootcomplete()
 	post_bootcomplete
 }
 
-function do_hci()
-{
-	local hci=`hciconfig | grep ^hci | cut -d: -f1`
-	local btd="`getprop init.svc.bluetoothd`"
-	log -t bluetoothd -p i "$btd ($hci)"
-	if [ -n "`getprop hal.bluetooth.uart`" ]; then
-		[ "`getprop init.svc.bluetoothd`" = "running" ] && hciconfig $hci up
-	fi
-}
-
 PATH=/sbin:/system/bin:/system/xbin
 
 DMIPATH=/sys/class/dmi/id
@@ -455,9 +444,6 @@ case "$1" in
 	bootcomplete)
 		do_bootcomplete
 		;;
-	hci)
-		do_hci
-		;;
 	init|"")
 		do_init
 		;;

--- a/init.x86.rc
+++ b/init.x86.rc
@@ -1,4 +1,3 @@
-import /init.bluetooth.rc
 import /init.superuser.rc
 
 on early-init
@@ -103,7 +102,7 @@ service powerbtnd /system/bin/powerbtnd
 service logcat /system/bin/logcat -v threadtime -f /data/log.txt
     class debug
 
-service btattach /system/bin/btattach -Pbcm
+service btattach /system/bin/btattach
     class main
     disabled
     oneshot
@@ -129,12 +128,6 @@ on property:sys.boot_completed=1
     write /proc/sys/kernel/ctrl-alt-del 0
     exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
 
-on property:init.svc.bluetoothd=running
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
-
-on property:init.svc.bluetoothd=stopped
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh hci
-
 on property:net.dns1=*
     exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
 

--- a/packages.mk
+++ b/packages.mk
@@ -64,6 +64,11 @@ PRODUCT_PACKAGES += \
     ntfsfix \
     tune2fs \
 
+PRODUCT_PACKAGES += \
+    btattach \
+    hciconfig \
+    hcitool \
+
 # Third party apps
 PRODUCT_PACKAGES += \
     Eleven \