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

Commit 81af4733 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Fix lockscreen bugs with SHOW_WHEN_LOCKED"

parents 01ea304f f253eeb9

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+6 −0
Original line number Diff line number Diff line
@@ -867,6 +867,12 @@ public class KeyguardViewMediator extends SystemUI { 
     */

    private void handleSetOccluded(boolean isOccluded) {

        synchronized (KeyguardViewMediator.this) {

            if (mHiding && isOccluded) {

                // We're in the process of going away but WindowManager wants to show a

                // SHOW_WHEN_LOCKED activity instead.

                startKeyguardExitAnimation(0, 0);

            }



            if (mOccluded != isOccluded) {

                mOccluded = isOccluded;

                mStatusBarKeyguardViewManager.setOccluded(isOccluded);

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+3 −0
Original line number Diff line number Diff line
@@ -145,6 +145,9 @@ public class KeyguardServiceDelegate { 
            if (mKeyguardState.bootCompleted) {

                mKeyguardService.onBootCompleted();

            }

            if (mKeyguardState.occluded) {

                mKeyguardService.setOccluded(mKeyguardState.occluded);

            }

        }



        @Override