Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12fc848 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

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

If there is no lock pin set.

Bug: 19569109
Change-Id: I9ca17b61e72576f7b90b1598b2ace6e9d79b263a
parent a330b1a0

src/com/android/settings/CredentialStorage.java

+7 −1
Original line number Diff line number Diff line
@@ -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