Merge "Ensure keyguard is considered unlocked on devices that disable it."

2018-01-18 23:27:37 +00:00
parent 5cc9f721ce ef344a3de3
commit 9e1afde8cd
1 changed files with 4 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -707,6 +707,10 @@ public class KeyguardViewMediator extends SystemUI {
                    && !mLockPatternUtils.isLockScreenDisabled(
                            KeyguardUpdateMonitor.getCurrentUser()),
                    mSecondaryDisplayShowing, true /* forceCallbacks */);
+        } else {
+            // The system's keyguard is disabled or missing.
+            setShowingLocked(mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser()),
+                    mSecondaryDisplayShowing, true);
        }

        mStatusBarKeyguardViewManager =