Merge "Create-user logtag and re-order" (e5db76d9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/UserManagerService.java

+22 −21

Original line number	Diff line number	Diff line
		@@ -3306,27 +3306,6 @@ public class UserManagerService extends IUserManager.Stub {
		}
		}

		private long logUserCreateJourneyBegin(@UserIdInt int userId, String userType,
		@UserInfoFlag int flags) {
		final long sessionId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
		// log the journey atom with the user metadata
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED, sessionId,
		FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__JOURNEY__USER_CREATE,
		/* origin_user= */ -1, userId, UserManager.getUserTypeForStatsd(userType), flags);
		// log the event atom to indicate the event start
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__BEGIN);
		return sessionId;
		}

		private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId, boolean finish) {
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER,
		finish ? FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH
		: FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__NONE);
		}

		private UserInfo createUserInternalUncheckedNoTracing(@Nullable String name,
		@NonNull String userType, @UserInfoFlag int flags, @UserIdInt int parentId,
		boolean preCreate, @Nullable String[] disallowedPackages,
		@@ -3433,6 +3412,7 @@ public class UserManagerService extends IUserManager.Stub {
		}

		userId = getNextAvailableId();
		Slog.i(LOG_TAG, "Creating user " + userId + " of type " + userType);
		Environment.getUserSystemDirectory(userId).mkdirs();

		synchronized (mUsersLock) {
		@@ -3684,6 +3664,27 @@ public class UserManagerService extends IUserManager.Stub {
		&& !userTypeDetails.getName().equals(UserManager.USER_TYPE_FULL_RESTRICTED);
		}

		private long logUserCreateJourneyBegin(@UserIdInt int userId, String userType,
		@UserInfoFlag int flags) {
		final long sessionId = ThreadLocalRandom.current().nextLong(1, Long.MAX_VALUE);
		// log the journey atom with the user metadata
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED, sessionId,
		FrameworkStatsLog.USER_LIFECYCLE_JOURNEY_REPORTED__JOURNEY__USER_CREATE,
		/* origin_user= */ -1, userId, UserManager.getUserTypeForStatsd(userType), flags);
		// log the event atom to indicate the event start
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__BEGIN);
		return sessionId;
		}

		private void logUserCreateJourneyFinish(long sessionId, @UserIdInt int userId, boolean finish) {
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED, sessionId, userId,
		FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__EVENT__CREATE_USER,
		finish ? FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__FINISH
		: FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED__STATE__NONE);
		}

		@VisibleForTesting
		UserData putUserInfo(UserInfo userInfo) {
		final UserData userData = new UserData();