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

Commit e2fcb7ed authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Don't require awakeKeyguard for activeUnlock" into tm-dev am: 6a69a2c8 am: fe29e5e6 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186409



Change-Id: If92ddfd1faa75d440b04358f69b901d34703b274
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c168c8ef fe29e5e6

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
@@ -2437,7 +2437,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: