Merge "Added an event before clearning user journey" into rvc-dev (15f86c34) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/UserController.java

+16 −1

Original line number	Diff line number	Diff line
		@@ -2515,7 +2515,7 @@ class UserController implements Handler.Callback {
		showUserSwitchDialog(fromToUserPair);
		break;
		case CLEAR_USER_JOURNEY_SESSION_MSG:
		clearSessionId(msg.arg1);
		logAndClearSessionId(msg.arg1);
		break;
		}
		return false;
		@@ -2629,6 +2629,21 @@ class UserController implements Handler.Callback {
		}
		}

		/**
		* Log a final event of the {@link UserJourneySession} and clear it.
		*/
		private void logAndClearSessionId(@UserIdInt int userId) {
		synchronized (mUserIdToUserJourneyMap) {
		final UserJourneySession userJourneySession = mUserIdToUserJourneyMap.get(userId);
		if (userJourneySession != null) {
		FrameworkStatsLog.write(FrameworkStatsLog.USER_LIFECYCLE_EVENT_OCCURRED,
		userJourneySession.mSessionId, userId, USER_LIFECYCLE_EVENT_UNKNOWN,
		USER_LIFECYCLE_EVENT_STATE_NONE);
		}
		clearSessionId(userId);
		}
		}

		/**
		* Helper class to store user journey and session id.
		*