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

Browse Source
This commit is contained in:
Arthur Hung
2021-07-28 02:26:51 +00:00
committed by Android (Google) Code Review
parent 75fa0482a6 5fceebd597
commit 4ee67cf14e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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