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

Commit 8982038d authored by Beverly's avatar Beverly Committed by Beverly Tai
Browse files

Don't require awakeKeyguard for activeUnlock 

Request active unlock even when the device is on AoD/dozing.
Allow TrustAgents with FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE to
dismiss the keyguard if the device's screen isn't on.

Fixes: 231333697
Change-Id: I23cea0743c89ca6d4eb761aff12672d79a2820dc
parent 5ecc0793

packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java

+4 −1
Original line number Diff line number Diff line
@@ -71,13 +71,16 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView> 
                public void onTrustGrantedWithFlags(int flags, int userId) {

                    if (userId != KeyguardUpdateMonitor.getCurrentUser()) return;

                    boolean bouncerVisible = mView.isVisibleToUser();

                    boolean temporaryAndRenewable =

                            (flags & TrustAgentService.FLAG_GRANT_TRUST_TEMPORARY_AND_RENEWABLE)

                            != 0;

                    boolean initiatedByUser =

                            (flags & TrustAgentService.FLAG_GRANT_TRUST_INITIATED_BY_USER) != 0;

                    boolean dismissKeyguard =

                            (flags & TrustAgentService.FLAG_GRANT_TRUST_DISMISS_KEYGUARD) != 0;



                    if (initiatedByUser || dismissKeyguard) {

                        if (mViewMediatorCallback.isScreenOn()

                        if ((mViewMediatorCallback.isScreenOn() || temporaryAndRenewable)

                                && (bouncerVisible || dismissKeyguard)) {

                            if (!bouncerVisible) {

                                // The trust agent dismissed the keyguard without the user proving

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -2405,7 +2405,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab 
        // Triggers:

        final boolean triggerActiveUnlockForAssistant = shouldTriggerActiveUnlockForAssistant();

        final boolean awakeKeyguard = mBouncerFullyShown || mUdfpsBouncerShowing

                || (mKeyguardIsVisible && mDeviceInteractive && !mGoingToSleep

                || (mKeyguardIsVisible && !mGoingToSleep

                && mStatusBarState != StatusBarState.SHADE_LOCKED);



        // Gates: