From a12fc84877647499006a3ca4a4599878bb888543 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Tue, 3 Mar 2015 12:32:30 -0500
Subject: Prompt for lock pin on VPN screen when credential restriction is
 enabled.

If there is no lock pin set.

Bug: 19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a
---
 src/com/android/settings/CredentialStorage.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

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();
+            }
         }
     }
 
-- 
cgit v1.1