From 28937c0216ad1e1f8876aa9a2760c33d4e56c98d Mon Sep 17 00:00:00 2001
From: Riddle Hsu <riddlehsu@google.com>
Date: Wed, 7 Oct 2020 21:45:41 +0800
Subject: [PATCH] Fix potential NPE when turning on screen by activity

Bug: 163993448
Test: Launch activity with FLAG_DISMISS_KEYGUARD | FLAG_TURN_SCREEN_ON
      while screen if off.
Change-Id: I4b64b2ceb7f06b4766be35cff4a5bacfd3d72197
---
 .../core/java/com/android/server/wm/KeyguardController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 80c7366a66786..71eb18ca4117f 100644
--- 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) {