diff options
| author | Danny Baumann <dannybaumann@web.de> | 2012-06-12 10:24:16 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2012-06-15 08:36:46 +0200 |
| commit | 1ec08fd3ad97cc96763c914c25185365171e7104 (patch) | |
| tree | 1c8f12b5ba3184051e970198a04a2c9e2fd85837 /policy | |
| parent | 142766a64ec74c7e9ec284beb78fffc0dc7df3c2 (diff) | |
| download | frameworks_base-1ec08fd3ad97cc96763c914c25185365171e7104.zip frameworks_base-1ec08fd3ad97cc96763c914c25185365171e7104.tar.gz frameworks_base-1ec08fd3ad97cc96763c914c25185365171e7104.tar.bz2 | |
Don't consider input restricted if keyguard is still disabled.
Change-Id: I00a351311d0933fe326bda33f5c988a6232cca16
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index fbf673b..2078370 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -598,7 +598,13 @@ public class KeyguardViewMediator implements KeyguardViewCallback, * was suppressed by an app that disabled the keyguard or we haven't been provisioned yet. */ public boolean isInputRestricted() { - return mShowing || mNeedToReshowWhenReenabled || !mUpdateMonitor.isDeviceProvisioned(); + if (mShowing) { + return true; + } + if (mExternallyEnabled && mNeedToReshowWhenReenabled) { + return true; + } + return !mUpdateMonitor.isDeviceProvisioned(); } /** |