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

Merge "Sometimes Screen does not wake up while receiving whatsapp video call" am: 540962a60a am: 67bbb93d55

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

Change-Id: I5b5c5889c60557dfc36ad12671c564b7039fce65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-17 15:10:52 +00:00
committed by Automerger Merge Worker
parent 7a53869a71 67bbb93d55
commit 72a090106a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/KeyguardController.java
View File

@@ -663,8 +663,7 @@ class KeyguardController {
display.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;
}
if (mTopTurnScreenOnActivity != lastTurnScreenOnActivity
&& mTopTurnScreenOnActivity != null
if (mTopTurnScreenOnActivity != null
&& !mService.mWindowManager.mPowerManager.isInteractive()
&& (mRequestDismissKeyguard || occludedByActivity)) {
controller.mTaskSupervisor.wakeUp("handleTurnScreenOn");