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

Commit 680043ca authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

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

parents eecdb690 28937c02

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) {