Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I4ec95e79561cd1fe82b9f5075119f94f5d1b8b1d
This commit is contained in:
Arthur Hung
2021-07-29 19:12:53 +00:00
committed by Automerger Merge Worker
parent 974009717b 4ee67cf14e
commit c51bd5ff66
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -3845,9 +3845,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
mCameraGestureTriggered = false; mCameraGestureTriggered = false;
final MutableBoolean outLaunched = new MutableBoolean(false); final MutableBoolean outLaunched = new MutableBoolean(false);
mGestureLauncherService.interceptPowerKeyDown(event, interactive, outLaunched); final boolean intercept =
mGestureLauncherService.interceptPowerKeyDown(event, interactive, outLaunched);
if (!outLaunched.value) { 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; mCameraGestureTriggered = true;
if (mRequestedOrSleepingDefaultDisplay) { if (mRequestedOrSleepingDefaultDisplay) {