OSDN Git Service

Merge remote-tracking branch 'x86/nougat-x86' into oreo-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 12 Mar 2019 09:05:41 +0000 (17:05 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 12 Mar 2019 09:05:41 +0000 (17:05 +0800)
1  2 
CleanSpec.mk
init.sh

diff --cc CleanSpec.mk
@@@ -1,4 -1,1 +1,5 @@@
 +$(call add-clean-step, rm -f $(TARGET_OUT_VENDOR)/*/*/android.hardware.graphics.allocator@2.0-service*)
 +$(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 --cc init.sh
+++ b/init.sh
@@@ -199,9 -187,12 +199,12 @@@ function init_hal_power(
  
        # TODO
        case "$PRODUCT" in
 -              HP*Omni*|OEMB|Surface*3|T10*TA)
 +              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