summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tony Mantler <nicoya@google.com> 2018-01-31 18:06:28 +0000
committer Tony Mantler <nicoya@google.com> 2018-01-31 18:18:23 +0000
commit57426f516ea35df9ec073b2f2832b54f5fac35ef (patch)
tree1ba2eb801b7d39cfa826b79394d9d7e022f073f7
parentef344a3de33eb6979074b8636cc848c64fb5d039 (diff)
Revert "Ensure keyguard is considered unlocked on devices that disable it."
This reverts commit ef344a3de33eb6979074b8636cc848c64fb5d039. Reason for revert: Patch re-opens b/37221109 and makes devices with restricted profile unusable after rebooting Bug: 71551000 Test: Rebooted device with restricted profile present Change-Id: Ibc5d2843bda7828123e5017a38bab6b6adf67e8b
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 8501519d26aa..653e5000f72c 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -707,10 +707,6 @@ 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 =