Merge "Temporarily disable retry on bouncer when pattern" into qt-r1-dev

am: 30ff6c674f Change-Id: I834affd90cd01fe0cee78a1feb0ae5086e9cf228
2019-05-22 17:20:08 -07:00
parent ac3954e484 30ff6c674f
commit 9ca8162004
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -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() {