commit 9579274cda38c552b43febe0980f0ec6bd07277d
author Ricky Wai <rickywai@google.com> Tue May 24 19:28:53 2016 +0100
committer Ricky Wai <rickywai@google.com> Wed May 25 13:11:24 2016 +0000
tree 83ff7a5c56e9dcbe4d63dc9ef9aed41830f37d90
parent 06b7d7cdf954902dad8fde766fe54ea315a463b3

Hide work profile key in user credentials screen

Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef

src/com/android/settings/UserCredentialsSettings.java

diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java
index a09800b..c264ff7 100644
--- a/src/com/android/settings/UserCredentialsSettings.java
+++ b/src/com/android/settings/UserCredentialsSettings.java
@@ -45,6 +45,7 @@
 import android.widget.TextView;
 
 import com.android.internal.logging.MetricsProto.MetricsEvent;
+import com.android.internal.widget.LockPatternUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
@@ -203,6 +204,11 @@
             KeyStore keyStore = KeyStore.getInstance();
             for (final Credential.Type type : Credential.Type.values()) {
                 for (final String alias : keyStore.list(type.prefix)) {
+                    // Do not show work profile keys in user credentials
+                    if (alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_ENCRYPT) ||
+                            alias.startsWith(LockPatternUtils.PROFILE_KEY_NAME_DECRYPT)) {
+                        continue;
+                    }
                     Credential c = credentials.get(alias);
                     if (c == null) {
                         credentials.put(alias, (c = new Credential(alias)));