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

Merge "Cached list of pre-created users on UserManagerService." into rvc-qpr-dev am: e54b76c015

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

Change-Id: I90608bed2bc62c50905ebfbab6678acc20299f19
This commit is contained in:
TreeHugger Robot
2020-09-02 00:57:30 +00:00
committed by Automerger Merge Worker
parent aca7ba2ce2 e54b76c015
commit 763f11490e
2 changed files with 61 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
services/core/java/com/android/server/pm/UserManagerService.java
View File

@@ -114,7 +114,6 @@ import com.android.server.SystemService;
import com.android.server.am.UserState;
import com.android.server.storage.DeviceStorageMonitorInternal;
import com.android.server.utils.TimingsTraceAndSlog;
import com.android.server.wm.ActivityTaskManagerInternal;
import libcore.io.IoUtils;
@@ -134,6 +133,7 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -406,6 +406,10 @@ public class UserManagerService extends IUserManager.Stub {
@GuardedBy("mUsersLock")
private int[] mUserIds;
@GuardedBy("mUsersLock")
private int[] mUserIdsIncludingPreCreated;
@GuardedBy("mPackagesLock")
private int mNextSerialNumber;
private int mUserVersion = 0;
@@ -2480,16 +2484,35 @@ public class UserManagerService extends IUserManager.Stub {
}
/**
* Returns an array of user ids. This array is cached here for quick access, so do not modify or
* cache it elsewhere.
* Returns an array of user ids.
*
* <p>This array is cached here for quick access, so do not modify or cache it elsewhere.
*
* @return the array of user ids.
*/
public int[] getUserIds() {
public @NonNull int[] getUserIds() {
synchronized (mUsersLock) {
return mUserIds;
}
}
/**
* Returns an array of user ids, including pre-created users.
*
* <p>This method should only used for the specific cases that need to handle pre-created users;
* most callers should call {@link #getUserIds()} instead.
*
* <p>This array is cached here for quick access, so do not modify or
* cache it elsewhere.
*
* @return the array of user ids.
*/
public @NonNull int[] getUserIdsIncludingPreCreated() {
synchronized (mUsersLock) {
return mUserIdsIncludingPreCreated;
}
}
@GuardedBy({"mRestrictionsLock", "mPackagesLock"})
private void readUserListLP() {
if (!mUserListFile.exists()) {
@@ -4327,23 +4350,43 @@ public class UserManagerService extends IUserManager.Stub {
*/
private void updateUserIds() {
int num = 0;
int numIncludingPreCreated = 0;
synchronized (mUsersLock) {
final int userSize = mUsers.size();
for (int i = 0; i < userSize; i++) {
UserInfo userInfo = mUsers.valueAt(i).info;
if (!userInfo.partial && !userInfo.preCreated) {
num++;
final UserInfo userInfo = mUsers.valueAt(i).info;
if (!userInfo.partial) {
numIncludingPreCreated++;
if (!userInfo.preCreated) {
num++;
}
}
}
if (DBG) {
Slog.d(LOG_TAG, "updateUserIds(): numberUsers= " + num
+ " includingPreCreated=" + numIncludingPreCreated);
}
final int[] newUsers = new int[num];
final int[] newUsersIncludingPreCreated = new int[numIncludingPreCreated];
int n = 0;
int nIncludingPreCreated = 0;
for (int i = 0; i < userSize; i++) {
UserInfo userInfo = mUsers.valueAt(i).info;
if (!userInfo.partial && !userInfo.preCreated) {
newUsers[n++] = mUsers.keyAt(i);
final UserInfo userInfo = mUsers.valueAt(i).info;
if (!userInfo.partial) {
final int userId = mUsers.keyAt(i);
newUsersIncludingPreCreated[nIncludingPreCreated++] = userId;
if (!userInfo.preCreated) {
newUsers[n++] = userId;
}
}
}
mUserIds = newUsers;
mUserIdsIncludingPreCreated = newUsersIncludingPreCreated;
if (DBG) {
Slog.d(LOG_TAG, "updateUserIds(): userIds= " + Arrays.toString(mUserIds)
+ " includingPreCreated=" + Arrays.toString(mUserIdsIncludingPreCreated));
}
}
}
@@ -4791,6 +4834,13 @@ public class UserManagerService extends IUserManager.Stub {
synchronized (mUserStates) {
pw.println(" Started users state: " + mUserStates);
}
synchronized (mUsersLock) {
pw.print(" Cached user IDs: ");
pw.println(Arrays.toString(mUserIds));
pw.print(" Cached user IDs (including pre-created): ");
pw.println(Arrays.toString(mUserIdsIncludingPreCreated));
}
} // synchronized (mPackagesLock)
// Dump some capabilities

14
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -83,7 +83,6 @@ import android.content.pm.PackageParser;
import android.content.pm.ParceledListSlice;
import android.content.pm.PermissionGroupInfo;
import android.content.pm.PermissionInfo;
import android.content.pm.UserInfo;
import android.content.pm.parsing.component.ParsedPermission;
import android.content.pm.parsing.component.ParsedPermissionGroup;
import android.content.pm.permission.SplitPermissionInfoParcelable;
@@ -121,7 +120,6 @@ import android.util.Log;
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
import android.util.TimingsTraceLog;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@@ -3078,17 +3076,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
* @return user ids for created users and pre-created users
*/
private int[] getAllUserIds() {
final TimingsTraceLog t = new TimingsTraceLog(TAG, Trace.TRACE_TAG_SYSTEM_SERVER);
t.traceBegin("getAllUserIds");
List<UserInfo> users = UserManagerService.getInstance().getUsers(
/*excludePartial=*/ true, /*excludeDying=*/ true, /*excludePreCreated=*/ false);
int size = users.size();
final int[] userIds = new int[size];
for (int i = 0; i < size; i++) {
userIds[i] = users.get(i).id;
}
t.traceEnd();
return userIds;
return UserManagerService.getInstance().getUserIdsIncludingPreCreated();
}
/**