diff options
author | Julia Reynolds <juliacr@google.com> | 2015-03-03 12:32:30 -0500 |
---|---|---|
committer | Julia Reynolds <juliacr@google.com> | 2015-03-03 12:39:59 -0500 |
commit | a12fc84877647499006a3ca4a4599878bb888543 (patch) | |
tree | 780ffeeba1193207b61952ba467f1e355db28bbf /src | |
parent | a330b1a093869194203bf4d40ea81676c7f6dbb3 (diff) | |
download | packages_apps_Settings-a12fc84877647499006a3ca4a4599878bb888543.zip packages_apps_Settings-a12fc84877647499006a3ca4a4599878bb888543.tar.gz packages_apps_Settings-a12fc84877647499006a3ca4a4599878bb888543.tar.bz2 |
Prompt for lock pin on VPN screen when credential restriction is enabled.
If there is no lock pin set.
Bug: 19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a
Diffstat (limited to 'src')
-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(); + } } } |