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

Commit ae760073 authored by Sean Pont's avatar Sean Pont
Browse files

Provide isLocked to wallet instead of isUnlocked 

This was working before only because of a bug in
KeyguardStateController where it would provide inconsistent values after
biometric unlock.

Bug: 155931571
Test: manual

Change-Id: I644795bbc48ff9b175172a90c3c9bbc6516fc3c9
parent 2dfc9f85

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+3 −6
Original line number Diff line number Diff line
@@ -360,10 +360,9 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 
            @Override

            public void onUnlockedChanged() {

                if (mDialog != null) {

                    boolean unlocked = keyguardStateController.isUnlocked()

                            || keyguardStateController.canDismissLockScreen();

                    if (mDialog.mPanelController != null) {

                        mDialog.mPanelController.onDeviceLockStateChanged(unlocked);

                        mDialog.mPanelController.onDeviceLockStateChanged(

                                !mKeyguardStateController.isUnlocked());

                    }

                    if (!mDialog.isShowingControls() && shouldShowControls()) {

                        mDialog.showControls(mControlsUiController);
@@ -2378,9 +2377,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener, 


    @VisibleForTesting

    protected boolean shouldShowControls() {

        boolean isUnlocked = mKeyguardStateController.isUnlocked()

                || mKeyguardStateController.canDismissLockScreen();

        return (isUnlocked || mShowLockScreenCardsAndControls)

        return (mKeyguardStateController.isUnlocked() || mShowLockScreenCardsAndControls)

                && mControlsUiController.getAvailable()

                && !mControlsServiceInfos.isEmpty();

    }