From 341fdf9badbddd3cab563c03519ab7a8e220e169 Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Tue, 6 Feb 2018 13:22:40 +0800
Subject: [PATCH] Android-x86 7.1-r1 release (20180206)

---
 fstab.x86   |  1 +
 init.sh     | 12 ++++++++++--
 packages.mk |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fstab.x86 b/fstab.x86
index e31be00..458d2fd 100644
--- a/fstab.x86
+++ b/fstab.x86
@@ -6,3 +6,4 @@ none			/cache		tmpfs	nosuid,nodev,noatime	defaults
 /devices/*/*sdmmc*/*		auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/*/80860F14:01/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/*/80860F14:02/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
+/devices/*/PNP0FFF:00/mmc_*	auto	auto	defaults		voldmanaged=sdcard1:auto,encryptable=userdata
diff --git a/init.sh b/init.sh
index a4dd6f7..cde8a7c 100644
--- a/init.sh
+++ b/init.sh
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013-2015 The Android-x86 Open Source Project
+# Copyright (C) 2013-2018 The Android-x86 Open Source Project
 #
 # License: GNU Public License v2 or later
 #
@@ -10,6 +10,11 @@ function set_property()
 	[ -n "$DEBUG" ] && echo "$1"="$2" >> /dev/x86.prop
 }
 
+function set_prop_if_empty()
+{
+	[ -z "$(getprop $1)" ] && set_property "$1" "$2"
+}
+
 function init_misc()
 {
 	# device information
@@ -53,7 +58,6 @@ function init_hal_bluetooth()
 		T10*TA|HP*Omni*)
 			BTUART_PORT=/dev/ttyS1
 			set_property hal.bluetooth.uart.proto bcm
-			[ -z "$(getprop sleep.state)" ] && set_property sleep.state none
 			;;
 		MacBookPro8*)
 			rmmod b43
@@ -142,6 +146,7 @@ function init_hal_gralloc()
 				set_property ro.hardware.hwcomposer drm
 				set_property ro.hardware.gralloc gbm
 			fi
+			set_prop_if_empty sleep.state none
 			;;
 		0*inteldrmfb|0*radeondrmfb|0*nouveaufb|0*svgadrmfb|0*amdgpudrmfb)
 			if [ "$HWACCEL" != "0" ]; then
@@ -178,6 +183,9 @@ function init_hal_power()
 
 	# TODO
 	case "$PRODUCT" in
+		HP*Omni*|OEMB|Surface*3|T10*TA)
+			set_prop_if_empty sleep.state none
+			;;
 		*)
 			;;
 	esac
diff --git a/packages.mk b/packages.mk
index 3dd2df8..6bae5ef 100644
--- a/packages.mk
+++ b/packages.mk
@@ -97,3 +97,4 @@ PRODUCT_PACKAGES += \
 # Third party apps
 PRODUCT_PACKAGES += \
     Eleven \
+    TSCalibration2 \
-- 
2.11.0