Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed how com.android.server.pm.Settings handle pre-created users." am: 8f0008900d am: 22ac3a45ea

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1393496

Change-Id: I46453773f083eaa4e3a8988ee1a496d79f756dc7
This commit is contained in:
Treehugger Robot
2020-08-07 17:10:27 +00:00
committed by Automerger Merge Worker
parent 15bbc06795 22ac3a45ea
commit 8a027191d2
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/pm/Settings.java
View File

@@ -2709,7 +2709,7 @@ public final class Settings {
private void writePackageListLPrInternal(int creatingUserId) {
// Only derive GIDs for active users (not dying)
final List<UserInfo> users = getUsers(UserManagerService.getInstance(), true);
final List<UserInfo> users = getActiveUsers(UserManagerService.getInstance(), true);
int[] userIds = new int[users.size()];
for (int i = 0; i < userIds.length; i++) {
userIds[i] = users.get(i).id;
@@ -4449,25 +4449,43 @@ public final class Settings {
}
/**
* Return all users on the device, including partial or dying users.
* Returns all users on the device, including pre-created and dying users.
*
* @param userManager UserManagerService instance
* @return the list of users
*/
private static List<UserInfo> getAllUsers(UserManagerService userManager) {
return getUsers(userManager, false);
return getUsers(userManager, /* excludeDying= */ false, /* excludePreCreated= */ false);
}
/**
* Return the list of users on the device. Clear the calling identity before calling into
* UserManagerService.
* Returns the list of users on the device, excluding pre-created ones.
*
* @param userManager UserManagerService instance
* @param excludeDying Indicates whether to exclude any users marked for deletion.
*
* @return the list of users
*/
private static List<UserInfo> getUsers(UserManagerService userManager, boolean excludeDying) {
private static List<UserInfo> getActiveUsers(UserManagerService userManager,
boolean excludeDying) {
return getUsers(userManager, excludeDying, /* excludePreCreated= */ true);
}
/**
* Returns the list of users on the device.
*
* @param userManager UserManagerService instance
* @param excludeDying Indicates whether to exclude any users marked for deletion.
* @param excludePreCreated Indicates whether to exclude any pre-created users.
*
* @return the list of users
*/
private static List<UserInfo> getUsers(UserManagerService userManager, boolean excludeDying,
boolean excludePreCreated) {
long id = Binder.clearCallingIdentity();
try {
return userManager.getUsers(excludeDying);
return userManager.getUsers(/* excludePartial= */ true, excludeDying,
excludePreCreated);
} catch (NullPointerException npe) {
// packagemanager not yet initialized
} finally {