PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Hide work profile key in user credentials screen

Browse Source 
Bug: 28878708
Change-Id: Ic9733ea973e1cc37028cb5f740969b5e24fb5aef
This commit is contained in:
Ricky Wai
2016-05-24 19:28:53 +01:00
parent 06b7d7cdf9
commit 9579274cda
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/UserCredentialsSettings.java
View File

@@ -45,6 +45,7 @@ import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.widget.LockPatternUtils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
@@ -203,6 +204,11 @@ public class UserCredentialsSettings extends OptionsMenuFragment implements OnIt
KeyStore keyStore = KeyStore.getInstance(); KeyStore keyStore = KeyStore.getInstance();
for (final Credential.Type type : Credential.Type.values()) { for (final Credential.Type type : Credential.Type.values()) {
for (final String alias : keyStore.list(type.prefix)) { 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); Credential c = credentials.get(alias);
if (c == null) { if (c == null) {
credentials.put(alias, (c = new Credential(alias))); credentials.put(alias, (c = new Credential(alias)));