commit e27fbc557f2d05feea845dea79d86f811f1da9c2
author Julia Reynolds <juliacr@google.com> Tue Mar 03 18:42:13 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 03 18:42:13 2015 +0000
tree 9f0758dc469237e68ef66c5d2e253068ed8911e8
parent 2cb25ddd6effcea9a369a6d9174adf4a1b9adb6d
parent a12fc84877647499006a3ca4a4599878bb888543

Merge "Prompt for lock pin on VPN screen when credential restriction is enabled."

src/com/android/settings/CredentialStorage.java

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 @@
                 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();
+            }
         }
     }