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

diff --git a/init.sh b/init.sh
index 89670f8..ccd1058 100644 (file)
--- 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

diff --git a/init.x86.rc b/init.x86.rc
index d6d3aa4..244cc71 100644 (file)
--- a/init.x86.rc
+++ b/init.x86.rc
@@ -15,7 +15,7 @@ on fs
     mount_all /fstab.${ro.hardware}
 
 on post-fs
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
+    exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh
 
 on post-fs-data
     mkdir /data/misc/wifi 0770 wifi wifi
@@ -63,32 +63,38 @@ service nativebridge /system/bin/enable_nativebridge
     class main
     disabled
     oneshot
+    seclabel u:r:zygote:s0
 
-service logcat /system/bin/logcat -v threadtime -f /data/log.txt
+service logcat /system/bin/logcat -b all -v threadtime -f /data/log.txt
     class debug
 
 service btattach /system/bin/btattach
     class main
     disabled
     oneshot
+    seclabel u:r:bluetooth:s0
 
 service rtk_hciattach /vendor/bin/rtk_hciattach -n -s 115200 /dev/rtk_h5 rtk_h5
     class main
     disabled
     oneshot
+    seclabel u:r:bluetooth:s0
 
 service wacom-input /system/bin/wacom-input
     disabled
     oneshot
+    seclabel u:r:inputflinger:s0
 
 service tablet-mode /system/bin/tablet-mode
     disabled
     oneshot
+    seclabel u:r:inputflinger:s0
 
 service ctrl-alt-del /system/bin/input keyevent --longpress POWER
     disabled
     oneshot
     keycodes 97 100 111
+    seclabel u:r:init:s0
 
 on property:system_init.startsurfaceflinger=0
     # disable cursor blinking
@@ -98,10 +104,10 @@ on property:system_init.startsurfaceflinger=0
 
 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
+    exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh bootcomplete
 
 on property:net.dns1=*
-    exec -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
+    exec u:r:init:s0 -- /system/bin/logwrapper /system/bin/sh /system/etc/init.sh netconsole
 
 on property:debug.logcat=1
     class_start debug

diff --git a/modules.blacklist b/modules.blacklist
index 832880d..aeccc19 100644 (file)
--- a/modules.blacklist
+++ b/modules.blacklist
@@ -1,4 +1,5 @@
 blacklist evbug
+blacklist hid_hyperv
 deferred  amdgpu
 deferred  nouveau
 deferred  radeon

diff --git a/tp_smapi/hdaps.c b/tp_smapi/hdaps.c
index f54099a..338f551 100644 (file)
--- a/tp_smapi/hdaps.c
+++ b/tp_smapi/hdaps.c
@@ -779,8 +779,12 @@ static int __init hdaps_init(void)
                        hdaps_invert = 0; /* default */
 
        /* Init timer before platform_driver_register, in case of suspend */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+       timer_setup(&hdaps_timer, hdaps_mousedev_poll, 0);
+#else
        init_timer(&hdaps_timer);
        hdaps_timer.function = hdaps_mousedev_poll;
+#endif
        ret = platform_driver_register(&hdaps_driver);
        if (ret)
                goto out;