From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 29 Mar 2018 08:01:24 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r1~34
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=5cfaa3b012fcff04896ddbc8f12f2ff498c04f94;hp=66fd14a317cbada5d7f05482504788839b26d9bf

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
---

diff --git a/init.sh b/init.sh
index 89670f8..ccd1058 100644
--- a/init.sh
+++ b/init.sh
@@ -55,7 +55,7 @@ function init_hal_bluetooth()
 	done
 
 	case "$PRODUCT" in
-		T10*TA|HP*Omni*)
+		T10*TA|M80TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
 			set_property hal.bluetooth.uart.proto bcm
 			;;
@@ -256,7 +256,7 @@ function init_hal_sensors()
 			modprobe hdaps
 			hal_sensors=hdaps
 			;;
-		*i7Stylus*)
+		*i7Stylus*|*M80TA*)
 			set_property ro.iio.accel.x.opt_scale -1
 			;;
 		*ONDATablet*)
@@ -377,6 +377,8 @@ function do_netconsole()
 
 function do_bootcomplete()
 {
+	hciconfig | grep -q hci || pm disable com.android.bluetooth
+
 	init_cpu_governor
 
 	[ -z "$(getprop persist.sys.root_access)" ] && setprop persist.sys.root_access 3