diff options
| author | Danny Baumann <dannybaumann@web.de> | 2012-06-30 16:23:06 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-06-30 16:23:06 +0400 |
| commit | 964474de6d1d2172d347104d39184644497ce80e (patch) | |
| tree | 1a12defcfcc0d9c0bfd632a8ce84858e6d5f6485 | |
| parent | ca0d4b92adc84c689f390896e088ef8f4ad68d53 (diff) | |
| parent | 1ec08fd3ad97cc96763c914c25185365171e7104 (diff) | |
| download | frameworks_base-964474de6d1d2172d347104d39184644497ce80e.zip frameworks_base-964474de6d1d2172d347104d39184644497ce80e.tar.gz frameworks_base-964474de6d1d2172d347104d39184644497ce80e.tar.bz2 | |
Merge "Don't consider input restricted if keyguard is still disabled." into ics
| -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(); } /** |