diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-07-01 10:11:38 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2013-07-01 11:57:20 +0200 |
| commit | 5292a65a2f2ee554364b9664fcccf06794b35f04 (patch) | |
| tree | 12d9ea8e315b0899cd6867b06e6b9195006157ad /policy | |
| parent | 9e3fa9cb673f69aa69de0294bebba61d10befddc (diff) | |
| download | frameworks_base-5292a65a2f2ee554364b9664fcccf06794b35f04.zip frameworks_base-5292a65a2f2ee554364b9664fcccf06794b35f04.tar.gz frameworks_base-5292a65a2f2ee554364b9664fcccf06794b35f04.tar.bz2 | |
Don't consider input restricted when the lockscreen is disabled by an
app.
Fixes the secure lockscreen occasionally appearing when disabling the
lockscreen via tile.
Change-Id: I078584d0235c1cc958f89ce12ddf3cc1117a5687
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java index 2cf4c8c..92bab3b 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -861,11 +861,10 @@ public class KeyguardViewMediator { /** * Given the state of the keyguard, is the input restricted? - * Input is restricted when the keyguard is showing, or when the keyguard - * was suppressed by an app that disabled the keyguard or we haven't been provisioned yet. + * Input is restricted when the keyguard is showing or we haven't been provisioned yet. */ public boolean isInputRestricted() { - return mShowing || mNeedToReshowWhenReenabled || !mUpdateMonitor.isDeviceProvisioned(); + return mShowing || !mUpdateMonitor.isDeviceProvisioned(); } private void doKeyguardLocked() { |