Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28937c02 authored by Riddle Hsu's avatar Riddle Hsu
Browse files

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
parent 89387761

services/core/java/com/android/server/wm/KeyguardController.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {