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

Commit 3a90803c authored by vm03's avatar vm03 Committed by Abhisek Devkota
Browse files

base: Fix proximity check on non power key 

To test, enable "Settings >> Display >> Prevent accidental wake-up"
and "Settings >> Buttons >> Home button Wake up device", hold your
hand over the proximity sensor and turn your phone on by home key.

Prior to this change, it will wake up the phone and after the change it will not.

Change-Id: Ifd14ff2ad9cd2cbc64209b9cf19e3c0ee0b6f40f
parent f919bb1a

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -5389,7 +5389,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (isValidGlobalKey(keyCode)

        if (isValidGlobalKey(keyCode)

                && mGlobalKeyManager.shouldHandleGlobalKey(keyCode, event)) {

                && mGlobalKeyManager.shouldHandleGlobalKey(keyCode, event)) {

            if (isWakeKey) {

            if (isWakeKey) {

                wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey);

                wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, true);

            }

            }

            return result;

            return result;

        }

        }
@@ -5725,7 +5725,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        }





        if (isWakeKey) {

        if (isWakeKey) {

            wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey);

            wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, true);

        }

        }





        return result;

        return result;