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

Commit 26f3ce38 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "PhoneWindowPolicy: Fix NPE race condition by excessive screen on delay" into cm-10.2

parents 652e1bdf 2039adde

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

+3 −2
Original line number Diff line number Diff line
@@ -4446,8 +4446,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }



            case KeyEvent.KEYCODE_POWER: {

                if ((mTopFullscreenOpaqueWindowState.getAttrs().flags

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

                if ((mTopFullscreenOpaqueWindowState != null &&

                        (mTopFullscreenOpaqueWindowState.getAttrs().flags

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

                    return result;

                }

                result &= ~ACTION_PASS_TO_USER;