Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88419876 authored by jrior001's avatar jrior001 Committed by Michael Bestas
Browse files

Wake Keys: enforce the wake keys overlay 

* Keys disabled as wake keys by the overlay were
  still being allowed to wake the device. This change
  enforces the hardwareWakeKeys settings.

Change-Id: Ifde0491b2de64a7f61a101cf22f5589cb5e841e2
parent c3e72308

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+10 −4
Original line number Diff line number Diff line
@@ -1628,6 +1628,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    public void updateSettings() {

        ContentResolver resolver = mContext.getContentResolver();

        boolean updateRotation = false;

        int mDeviceHardwareWakeKeys = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_deviceHardwareWakeKeys);

        synchronized (mLock) {

            mEndcallBehavior = Settings.System.getIntForUser(resolver,

                    Settings.System.END_BUTTON_BEHAVIOR,
@@ -1642,13 +1644,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    Settings.Secure.RING_HOME_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mHomeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1);

                    Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);

            mBackWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.BACK_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1);

                    Settings.System.BACK_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_BACK) != 0);

            mMenuWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.MENU_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1);

                    Settings.System.MENU_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_MENU) != 0);

            mVolumeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1);

                    Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_VOLUME) != 0);

            mVolBtnMusicControls = (Settings.System.getIntForUser(resolver,

                    Settings.System.VOLBTN_MUSIC_CONTROLS, 1, UserHandle.USER_CURRENT) == 1);