diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-07-02 10:57:30 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-02 10:57:30 -0700 |
| commit | fd58bc1504b3886b33ff4ad521221e82ebe5ad43 (patch) | |
| tree | d697eab2706b2e51c2bf3f3e1e7782ed4b3f9ddc /policy | |
| parent | fcf0fd60fdceec638722b62427223db8b4fd66a5 (diff) | |
| parent | 5292a65a2f2ee554364b9664fcccf06794b35f04 (diff) | |
| download | frameworks_base-fd58bc1504b3886b33ff4ad521221e82ebe5ad43.zip frameworks_base-fd58bc1504b3886b33ff4ad521221e82ebe5ad43.tar.gz frameworks_base-fd58bc1504b3886b33ff4ad521221e82ebe5ad43.tar.bz2 | |
Merge "Don't consider input restricted when the lockscreen is disabled by an app." into cm-10.1
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 92cf7ee..0426ac3 100644 --- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java @@ -876,11 +876,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() { |