diff options
| -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 1d21b9d8c141..283e12a6ddaf 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -661,8 +661,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"); |