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

Merge "Add user 0 when more than one UserInfo atom is reported."

Browse Source
This commit is contained in:
Anna Bauza
2022-08-09 13:23:52 +00:00
committed by Android (Google) Code Review
parent 7da331c78e 55294a807d
commit b82bd9b22d
1 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4653,34 +4653,31 @@ public class UserManagerService extends IUserManager.Stub {
}
final List<UserInfo> users = getUsersInternal(true, true, true);
final int size = users.size();
for (int idx = 0; idx < size; idx++) {
final UserInfo user = users.get(idx);
if (user.id == UserHandle.USER_SYSTEM) {
// Skip user 0. It's not interesting. We already know it exists, is running, and (if
// we know the device configuration) its userType.
continue;
if (size > 1) {
for (int idx = 0; idx < size; idx++) {
final UserInfo user = users.get(idx);
final int userTypeStandard = UserManager.getUserTypeForStatsd(user.userType);
final String userTypeCustom = (userTypeStandard == FrameworkStatsLog
.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__TYPE_UNKNOWN)
?
user.userType : null;
boolean isUserRunningUnlocked;
synchronized (mUserStates) {
isUserRunningUnlocked =
mUserStates.get(user.id, -1) == UserState.STATE_RUNNING_UNLOCKED;
}
data.add(FrameworkStatsLog.buildStatsEvent(FrameworkStatsLog.USER_INFO,
user.id,
userTypeStandard,
userTypeCustom,
user.flags,
user.creationTime,
user.lastLoggedInTime,
isUserRunningUnlocked
));
}
final int userTypeStandard = UserManager.getUserTypeForStatsd(user.userType);
final String userTypeCustom = (userTypeStandard ==
FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__USER_TYPE__TYPE_UNKNOWN) ?
user.userType : null;
boolean isUserRunningUnlocked;
synchronized (mUserStates) {
isUserRunningUnlocked =
mUserStates.get(user.id, -1) == UserState.STATE_RUNNING_UNLOCKED;
}
data.add(FrameworkStatsLog.buildStatsEvent(FrameworkStatsLog.USER_INFO,
user.id,
userTypeStandard,
userTypeCustom,
user.flags,
user.creationTime,
user.lastLoggedInTime,
isUserRunningUnlocked
));
}
return android.app.StatsManager.PULL_SUCCESS;
}