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

Commit 0124980e authored by Craig Mautner's avatar Craig Mautner
Browse files

resolved conflicts for merge of 082c0540 to lmp-mr1-dev-plus-aosp 

Change-Id: I93543a420eba5c6ae860a81a9afd9a2189d88903
parents 29e1c36d 082c0540

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

+1 −1
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // Detect user pressing the power button in panic when an application has

        // taken over the whole screen.

        boolean panic = mImmersiveModeConfirmation.onPowerKeyDown(interactive,

                event.getDownTime(), isImmersiveMode(mLastSystemUiFlags));

                SystemClock.elapsedRealtime(), isImmersiveMode(mLastSystemUiFlags));

        if (panic) {

            mHandler.post(mRequestTransientNav);

        }