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

Commit 19f12984 authored by Wilhelm Fitzpatrick's avatar Wilhelm Fitzpatrick Committed by Gerrit Code Review
Browse files

Prevent power key capture when screen is off 

The ability for an activity to capture the power key, which was
added to support power key as shutter in the camera, should only
allow the capture when the screen is on. Otherwise, if an activity
that captures the power key is to the front when the device turns
off, the user will be unable to turn it back on.

Change-Id: Ib119d6914ec72554b404c1cc17eef3a932d5d402
parent 9d0514d8

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -5176,7 +5176,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_POWER: {

            case KeyEvent.KEYCODE_POWER: {

                if (mTopFullscreenOpaqueWindowState != null &&

                if (mTopFullscreenOpaqueWindowState != null &&

                        (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags

                        (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags

                        & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY) != 0){

                        & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY) != 0

                        && mScreenOnFully){

                    return result;

                    return result;

                }

                }

                result &= ~ACTION_PASS_TO_USER;

                result &= ~ACTION_PASS_TO_USER;