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

Commit d2cee8ef authored by Arthur Hung's avatar Arthur Hung Committed by Automerger Merge Worker
Browse files

Merge "Keeps power key intercepted during a panic gesture" into sc-dev am:... 

Merge "Keeps power key intercepted during a panic gesture" into sc-dev am: 4ee67cf1 am: 8f1d0fee

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15389276

Change-Id: I169092cd8c65153a29ab88c08a8805c215f4d724
parents 8f96732d 8f1d0fee

services/core/java/com/android/server/policy/PhoneWindowManager.java

+6 −2
Original line number Diff line number Diff line
@@ -3853,9 +3853,13 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

        mCameraGestureTriggered = false;

        final MutableBoolean outLaunched = new MutableBoolean(false);

        final boolean intercept =

                mGestureLauncherService.interceptPowerKeyDown(event, interactive, outLaunched);

        if (!outLaunched.value) {

            return false;

            // If GestureLauncherService intercepted the power key, but didn't launch camera app,

            // we should still return the intercept result. This prevents the single key gesture

            // detector from processing the power key later on.

            return intercept;

        }

        mCameraGestureTriggered = true;

        if (mRequestedOrSleepingDefaultDisplay) {