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

Merge "Include disabled managed profiles in Accounts page" into oc-dev

Browse Source
This commit is contained in:
Esteban Talavera
2017-06-02 08:33:16 +00:00
committed by Android (Google) Code Review
parent 0187221bd8 9b86e9c822
commit 92f78354f9
3 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -603,7 +603,8 @@ public final class Utils extends com.android.settingslib.Utils {
}
/**
* Returns the managed profile of the current user or null if none found.
* Returns the managed profile of the current user or {@code null} if none is found or a profile
* exists but it is disabled.
*/
public static UserHandle getManagedProfile(UserManager userManager) {
List<UserHandle> userProfiles = userManager.getUserProfiles();
@@ -621,6 +622,29 @@ public final class Utils extends com.android.settingslib.Utils {
return null;
}
/**
* Returns the managed profile of the current user or {@code null} if none is found. Unlike
* {@link #getManagedProfile} this method returns enabled and disabled managed profiles.
*/
public static UserHandle getManagedProfileWithDisabled(UserManager userManager) {
// TODO: Call getManagedProfileId from here once Robolectric supports
// API level 24 and UserManager.getProfileIdsWithDisabled can be Mocked (to avoid having
// yet another implementation that loops over user profiles in this method). In the meantime
// we need to use UserManager.getProfiles that is available on API 23 (the one currently
// used for Settings Robolectric tests).
final int myUserId = UserHandle.myUserId();
List<UserInfo> profiles = userManager.getProfiles(myUserId);
final int count = profiles.size();
for (int i = 0; i < count; i++) {
final UserInfo profile = profiles.get(i);
if (profile.isManagedProfile()
&& profile.getUserHandle().getIdentifier() != myUserId) {
return profile.getUserHandle();
}
}
return null;
}
/**
* Retrieves the id for the given user's managed profile.
*