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

Commit 378c804d authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am c8867b28: Merge "Report keyguard as initially showing and secure until we know" into klp-dev 

* commit 'c8867b28':
  Report keyguard as initially showing and secure until we know
parents 1b21665b c8867b28

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -200,7 +200,7 @@ public class KeyguardViewMediator { 




    // cached value of whether we are showing (need to know this to quickly

    // cached value of whether we are showing (need to know this to quickly

    // answer whether the input should be restricted)

    // answer whether the input should be restricted)

    private boolean mShowing = false;

    private boolean mShowing;





    // true if the keyguard is hidden by another window

    // true if the keyguard is hidden by another window

    private boolean mHidden = false;

    private boolean mHidden = false;
@@ -508,6 +508,9 @@ public class KeyguardViewMediator { 
                ? lockPatternUtils : new LockPatternUtils(mContext);

                ? lockPatternUtils : new LockPatternUtils(mContext);

        mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER);

        mLockPatternUtils.setCurrentUser(UserHandle.USER_OWNER);





        // Assume keyguard is showing (unless it's disabled) until we know for sure...

        mShowing = !mLockPatternUtils.isLockScreenDisabled();



        WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);

        WindowManager wm = (WindowManager)context.getSystemService(Context.WINDOW_SERVICE);





        mKeyguardViewManager = new KeyguardViewManager(context, wm, mViewMediatorCallback,

        mKeyguardViewManager = new KeyguardViewManager(context, wm, mViewMediatorCallback,

policy/src/com/android/internal/policy/impl/keyguard/KeyguardServiceDelegate.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,14 @@ public class KeyguardServiceDelegate { 
    private KeyguardState mKeyguardState = new KeyguardState();

    private KeyguardState mKeyguardState = new KeyguardState();





    /* package */ static final class KeyguardState {

    /* package */ static final class KeyguardState {

        KeyguardState() {

            // Assume keyguard is showing and secure until we know for sure. This is here in

            // the event something checks before the service is actually started.

            // KeyguardService itself should default to this state until the real state is known.

            showing = true;

            showingAndNotHidden = true;

            secure = true;

        }

        boolean showing;

        boolean showing;

        boolean showingAndNotHidden;

        boolean showingAndNotHidden;

        boolean inputRestricted;

        boolean inputRestricted;