Merge "Fix potential NPE when turning on screen by activity"

2020-10-08 05:30:17 +00:00
parent eecdb690f6 28937c0216
commit 680043cae6
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -555,7 +555,7 @@ class KeyguardController {
                    && !mService.mWindowManager.mPowerManager.isInteractive()
                    && (mRequestDismissKeyguard || occludedByActivity)) {
                controller.mStackSupervisor.wakeUp("handleTurnScreenOn");
-                mTopOccludesActivity.setCurrentLaunchCanTurnScreenOn(false);
+                mTopTurnScreenOnActivity.setCurrentLaunchCanTurnScreenOn(false);
            }

            if (lastOccluded != mOccluded) {