From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Thu, 6 Sep 2018 06:56:02 +0000 (+0800)
Subject: Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
X-Git-Tag: android-x86-8.1-r1~17
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fdevice-generic-common.git;a=commitdiff_plain;h=c35ffc56465e575d812b712feb59acf0ae13cb79;hp=5d502e1c6c9cc53cb53f5914a4bdb34e190ccf15

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

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 185fe39..f5bad0e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -7,6 +7,7 @@ TARGET_BOARD_PLATFORM := android-x86
 # Some framework code requires this to enable BT
 BOARD_HAVE_BLUETOOTH := true
 BOARD_HAVE_BLUETOOTH_LINUX := true
+BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/generic/common/bluetooth
 
 BOARD_USE_LEGACY_UI := true
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index df91a8a..a6a788d 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -22,5 +22,6 @@
 #define BLUETOOTH_HCI_USE_USB          TRUE
 // Bluetooth Low Power Mode is supported on BT4.0
 #define HCILP_INCLUDED                 FALSE
+#define KERNEL_MISSING_CLOCK_BOOTTIME_ALARM TRUE
 
 #endif
diff --git a/idc/3M_3M_MicroTouch_USB_controller.idc b/idc/3M_3M_MicroTouch_USB_controller.idc
new file mode 100644
index 0000000..2df37ae
--- /dev/null
+++ b/idc/3M_3M_MicroTouch_USB_controller.idc
@@ -0,0 +1 @@
+touch.deviceType = touchScreen
diff --git a/init.sh b/init.sh
index 8b2e366..5f367db 100644
--- a/init.sh
+++ b/init.sh
@@ -55,6 +55,9 @@ function init_hal_bluetooth()
 	done
 
 	case "$PRODUCT" in
+		T100TAF)
+			set_property bluetooth.interface hci1
+			;;
 		T10*TA|M80TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
 			set_property hal.bluetooth.uart.proto bcm
@@ -267,7 +270,7 @@ function init_hal_sensors()
 		*ST70416-6*)
 			set_property ro.iio.accel.order 102
 			;;
-		*T10*TA*|*pnEZpad*)
+		*T*0*TA*|*pnEZpad*)
 			set_property ro.iio.accel.y.opt_scale -1
 			;;
 		*)