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 am: 8c27ef7ca0

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

Change-Id: I4890d79134cc5228d6b8994a1fda3cc0c245b179
This commit is contained in:
Arthur Hung
2021-07-28 02:56:41 +00:00
committed by Automerger Merge Worker
parent bdfd12a687 8c27ef7ca0
commit bb04a0bfd5
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

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