diff options
| author | 2023-06-17 14:32:20 +0000 | |
|---|---|---|
| committer | 2023-06-17 14:32:20 +0000 | |
| commit | 67bbb93d55ff6a419c3859a339003f1064cc17bd (patch) | |
| tree | 268bb2b28932dab2a420400b91d7663221a9c62f | |
| parent | 856508fb1affbbab1a81a8f5999ebe52a76ae629 (diff) | |
| parent | 540962a60ac38757123a8988c4d441848c7dbf93 (diff) | |
Merge "Sometimes Screen does not wake up while receiving whatsapp video call" am: 540962a60a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2620918
Change-Id: Ic7579381b27b113c81b2e3911d8c84e2ab1818ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/KeyguardController.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 574ab83eed0c..f365d6d2d8d1 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -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"); |