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

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

Browse Source
This commit is contained in:
Fyodor Kupolov
2016-04-11 16:40:54 +00:00
committed by Android (Google) Code Review
parent 3cd935c89c 4a4af5aec8
commit 1ef3164424
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/CredentialStorage.java
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. // Clear all the users credentials could have been installed in for this user.
final UserManager um = (UserManager) getSystemService(USER_SERVICE); 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) { for (int uid : SYSTEM_CREDENTIAL_UIDS) {
mKeyStore.clearUid(UserHandle.getUid(pi.id, uid)); mKeyStore.clearUid(UserHandle.getUid(userId, uid));
} }
} }
try { try {
KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this); KeyChainConnection keyChainConnection = KeyChain.bind(CredentialStorage.this);
try { try {

10
src/com/android/settings/Utils.java
View File

@@ -615,12 +615,10 @@ public final class Utils extends com.android.settingslib.Utils {
* @return the managed profile id or UserHandle.USER_NULL if there is none. * @return the managed profile id or UserHandle.USER_NULL if there is none.
*/ */
public static int getManagedProfileId(UserManager um, int parentUserId) { public static int getManagedProfileId(UserManager um, int parentUserId) {
List<UserInfo> profiles = um.getProfiles(parentUserId); int[] profileIds = um.getProfileIdsWithDisabled(parentUserId);
int numProfiles = profiles.size(); for (int profileId : profileIds) {
for (int i = 0; i < numProfiles; ++i) { if (profileId != parentUserId) {
UserInfo profile = profiles.get(i); return profileId;
if (profile.id != parentUserId) {
return profile.id;
} }
} }
return UserHandle.USER_NULL; return UserHandle.USER_NULL;