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

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8f9ce00..c04c745 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -2,3 +2,4 @@ $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.graphics.
 $(call add-clean-step, rm -rf $(TARGET_OUT_APPS_PRIVILEGED)/Telecom)
 $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.bluetooth@1.0-service* $(TARGET_OUT)/lib*/libbt-vendor.so)
 $(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/lib*/hw/android.hardware.bluetooth@1.0-impl.so)
+$(call add-clean-step, rm -rf $(TARGET_OUT_APPS)/AndroidTerm)

diff --git a/app/AndroidTerm.apk b/app/AndroidTerm.apk
deleted file mode 100644 (file)
index 36de1bd..0000000
Binary files a/app/AndroidTerm.apk and /dev/null differ

diff --git a/app/TermOnePlus.apk b/app/TermOnePlus.apk
new file mode 100644 (file)
index 0000000..e7518be
Binary files /dev/null and b/app/TermOnePlus.apk differ

diff --git a/init.sh b/init.sh
index 2287b62..867ae57 100644 (file)
--- a/init.sh
+++ b/init.sh
@@ -202,6 +202,9 @@ function init_hal_power()
                HP*Omni*|OEMB|Standard*PC*|Surface*3|T10*TA|VMware*)
                        set_prop_if_empty sleep.state none
                        ;;
+               e-tab*Pro)
+                       set_prop_if_empty sleep.state force
+                       ;;
                *)
                        ;;
        esac
@@ -272,6 +275,9 @@ function init_hal_sensors()
                        modprobe hdaps
                        hal_sensors=hdaps
                        ;;
+               *e-tabPro*)
+                       set_property ro.iio.accel.quirks no-trig
+                       ;&
                *i7Stylus*|*M80TA*)
                        set_property ro.iio.accel.x.opt_scale -1
                        ;;