Merge "Added getProfileIds method returning array of userIds" into nyc-dev

This commit is contained in:
Fyodor Kupolov
2016-04-11 16:40:54 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 9 deletions

View File

@@ -344,13 +344,12 @@ public final class CredentialStorage extends Activity {
// Clear all the users credentials could have been installed in for this user.
final UserManager um = (UserManager) getSystemService(USER_SERVICE);
for (UserInfo pi : um.getProfiles(UserHandle.getUserId(Process.myUid()))) {
for (int userId : um.getProfileIdsWithDisabled(UserHandle.myUserId())) {
for (int uid : SYSTEM_CREDENTIAL_UIDS) {
mKeyStore.clearUid(UserHandle.getUid(pi.id, uid));
mKeyStore.clearUid(UserHandle.getUid(userId, uid));
}
}
try {
KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
try {