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

src/com/android/settings/CredentialStorage.java

@@ -134,10 +134,16 @@ public final class CredentialStorage extends Activity {
                 // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
                 handleUnlockOrInstall();
             }
+        } else {
+            // 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();
             }
         }
+    }
 
     /**
      * Based on the current state of the KeyStore and key guard, try to