Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4891c01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Added an event before clearning user journey" into rvc-dev am: 15f86c34 am: 94517f65 

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

Change-Id: Id8de314ea93955a59442faf1e1e2b8be32dd2e13
parents 7e1a4db9 94517f65

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.

     *