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

Commit 6c5324af authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [7677329, 7677925] into qt-c2f2-release 

Change-Id: Ib5df14752ee7d4cc0954229602baa9cca059a0bd
parents 44017c13 7e378bc5

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

+2 −1
Original line number Diff line number Diff line
@@ -269,7 +269,8 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe 
        mSwipeUpToRetry = mUpdateMonitor.isUnlockWithFacePossible(userId)

                && securityMode != SecurityMode.SimPin

                && securityMode != SecurityMode.SimPuk

                && securityMode != SecurityMode.None;

                && securityMode != SecurityMode.None

                && securityMode != SecurityMode.Pattern;

    }



    public CharSequence getTitle() {