From 9579274cda38c552b43febe0980f0ec6bd07277d Mon Sep 17 00:00:00 2001 From: Ricky Wai Date: Tue, 24 May 2016 19:28:53 +0100 Subject: [PATCH] Hide work profile key in user credentials screen Bug: 28878708 Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef --- src/com/android/settings/UserCredentialsSettings.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index a09800b3e5..c264ff7318 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -45,6 +45,7 @@ import android.widget.ListView; 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 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt 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))); -- 2.11.0