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

[android-x86/device-generic-common.git] / init.sh

diff --git a/init.sh b/init.sh
index bbc5892..5f367db 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -55,7 +55,10 @@ function init_hal_bluetooth()
        done
 
        case "$PRODUCT" in
-               T10*TA|HP*Omni*)
+               T100TAF)
+                       set_property bluetooth.interface hci1
+                       ;;
+               T10*TA|M80TA|HP*Omni*)
                        BTUART_PORT=/dev/ttyS1
                        set_property hal.bluetooth.uart.proto bcm
                        ;;
@@ -256,22 +259,19 @@ function init_hal_sensors()
                        modprobe hdaps
                        hal_sensors=hdaps
                        ;;
-               *i7Stylus*)
-                       set_property ro.iio.accel.y.opt_scale -1
-                       set_property ro.iio.accel.z.opt_scale -1
+               *i7Stylus*|*M80TA*)
+                       set_property ro.iio.accel.x.opt_scale -1
                        ;;
                *ONDATablet*)
                        set_property ro.iio.accel.order 102
+                       set_property ro.iio.accel.x.opt_scale -1
+                       set_property ro.iio.accel.y.opt_scale -1
                        ;;
                *ST70416-6*)
                        set_property ro.iio.accel.order 102
-                       ;&
-               *Surface*3*|*svnOEMB*|*T305CA*|*Venue11Pro5130*|*20FQ*|*20FR*)
+                       ;;
+               *T*0*TA*|*pnEZpad*)
                        set_property ro.iio.accel.y.opt_scale -1
-                       ;&
-               *T10*TA*)
-                       set_property ro.iio.accel.x.opt_scale -1
-                       set_property ro.iio.accel.z.opt_scale -1
                        ;;
                *)
                        has_sensors=false
@@ -287,11 +287,11 @@ function init_hal_sensors()
                hal_sensors=hdaps
                has_sensors=true
        elif [ "$hal_sensors" != "kbd" ]; then
-               has_sensors=${HAS_SENSORS:-true}
+               has_sensors=true
        fi
 
        set_property ro.hardware.sensors $hal_sensors
-       set_property config.override_forced_orient $has_sensors
+       set_property config.override_forced_orient ${HAS_SENSORS:-$has_sensors}
 }
 
 function create_pointercal()
@@ -380,6 +380,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
@@ -418,6 +420,9 @@ function do_bootcomplete()
                        setkeycodes 0x66 172
                        setkeycodes 0x6b 127
                        ;;
+               VMware*)
+                       pm disable com.android.bluetooth
+                       ;;
                *)
                        ;;
        esac