diff options
-rw-r--r-- | src/com/android/settings/CredentialStorage.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index 60803dc..45d3d11 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -135,7 +135,13 @@ public final class CredentialStorage extends Activity { handleUnlockOrInstall(); } } else { - finish(); + // Users can set a screen lock if there is none even if they can't modify the + // credentials store. + if (ACTION_UNLOCK.equals(action) && mKeyStore.state() == KeyStore.State.UNINITIALIZED) { + ensureKeyGuard(); + } else { + finish(); + } } } |