diff options
| author | Danny Baumann <dannybaumann@web.de> | 2012-03-07 17:11:01 +0100 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2012-03-07 17:15:58 +0100 |
| commit | 2746af1b1b6156b967bc5a1c5ba00b68b3f3bd02 (patch) | |
| tree | 2c339da3a1cc9bc55d6597c745e615db1555bc5f | |
| parent | 4d2c5ca8a3598b37ddb202844e5e9d2bcb5f3b1b (diff) | |
| download | frameworks_base-2746af1b1b6156b967bc5a1c5ba00b68b3f3bd02.zip frameworks_base-2746af1b1b6156b967bc5a1c5ba00b68b3f3bd02.tar.gz frameworks_base-2746af1b1b6156b967bc5a1c5ba00b68b3f3bd02.tar.bz2 | |
Show PIN entry screen even if lockscreen is disabled.
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index af4e49e..e09c2c2 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -634,8 +634,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, int defValue=(CmSystem.getDefaultBool(mContext, CmSystem.CM_DEFAULT_DISABLE_LOCKSCREEN) ? 1 : 0); boolean disableLockscreen=(Settings.System.getInt(mContext.getContentResolver(), Settings.System.LOCKSCREEN_DISABLED, defValue) == 1); - if(disableLockscreen) - return; + // if another app is disabling us, don't show if (!mExternallyEnabled) { if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled"); @@ -666,9 +665,11 @@ public class KeyguardViewMediator implements KeyguardViewCallback, return; } - if (DEBUG) - Log.d(TAG, "doKeyguard: showing the applicable keyguard screen"); - showLocked(handlerMessage); + if (!disableLockscreen || state.isPinLocked()) { + if (DEBUG) + Log.d(TAG, "doKeyguard: showing the applicable keyguard screen"); + showLocked(handlerMessage); + } } } |