From 86f239ba4d20416753e81070295229ac2550b6c8 Mon Sep 17 00:00:00 2001 From: Anna Bauza Date: Wed, 26 Apr 2023 10:53:36 +0000 Subject: [PATCH] fix: Fix: CtsStatsdAtomHostTestCases First argument is always current user. Bug: 279417653 Test: atest CtsStatsdAtomHostTestCases:android.cts.statsdatom.users.UserLifecycleJourneyStatsTests#testRemoveGuestUser Change-Id: I102ed93f5a88a065f259b5cbaea42cc01c4a9ca1 --- .../com/android/server/pm/UserManagerService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 69f307d9700e4..0922c689c6f56 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1603,14 +1603,14 @@ public class UserManagerService extends IUserManager.Stub { return; } else if (info.isAdmin()) { // Exit if the user is already an Admin. - mUserJourneyLogger.logUserJourneyFinishWithError(userId, info, + mUserJourneyLogger.logUserJourneyFinishWithError(getCurrentUserId(), info, USER_JOURNEY_GRANT_ADMIN, ERROR_CODE_USER_ALREADY_AN_ADMIN); return; } info.flags ^= UserInfo.FLAG_ADMIN; writeUserLP(getUserDataLU(info.id)); } - mUserJourneyLogger.logUserJourneyFinishWithError(userId, info, + mUserJourneyLogger.logUserJourneyFinishWithError(getCurrentUserId(), info, USER_JOURNEY_GRANT_ADMIN, ERROR_CODE_UNSPECIFIED); } @@ -1638,7 +1638,7 @@ public class UserManagerService extends IUserManager.Stub { writeUserLP(user); } } - mUserJourneyLogger.logUserJourneyFinishWithError(userId, user.info, + mUserJourneyLogger.logUserJourneyFinishWithError(getCurrentUserId(), user.info, USER_JOURNEY_REVOKE_ADMIN, ERROR_CODE_UNSPECIFIED); } @@ -5554,13 +5554,15 @@ public class UserManagerService extends IUserManager.Stub { @Override public void userStopped(int userIdParam) { finishRemoveUser(userIdParam); - mUserJourneyLogger.logUserJourneyFinishWithError(userIdParam, + int originUserId = UserManagerService.this.getCurrentUserId(); + mUserJourneyLogger.logUserJourneyFinishWithError(originUserId, userData.info, USER_JOURNEY_USER_REMOVE, ERROR_CODE_UNSPECIFIED); } @Override public void userStopAborted(int userIdParam) { - mUserJourneyLogger.logUserJourneyFinishWithError(userIdParam, + int originUserId = UserManagerService.this.getCurrentUserId(); + mUserJourneyLogger.logUserJourneyFinishWithError(originUserId, userData.info, USER_JOURNEY_USER_REMOVE, ERROR_CODE_ABORTED); }