Merge "Added more info to car_user_svc_initial_user_info_req event" into sc-v2-dev
diff --git a/car-lib/src/com/android/car/internal/common/EventLogTags.logtags b/car-lib/src/com/android/car/internal/common/EventLogTags.logtags
index 45fdfe9..ce07e2b 100644
--- a/car-lib/src/com/android/car/internal/common/EventLogTags.logtags
+++ b/car-lib/src/com/android/car/internal/common/EventLogTags.logtags
@@ -66,7 +66,7 @@
#### User-related tags (range 150100 - 150199)
-150100 car_user_svc_initial_user_info_req (request_type|1),(timeout|1)
+150100 car_user_svc_initial_user_info_req (request_type|1),(timeout|1),(current_user_id|1),(current_user_flags|1),(number_existing_users|1)
150101 car_user_svc_initial_user_info_resp (status|1),(action|1),(user_id|1),(flags|1),(safe_name|3),(user_locales|3)
150103 car_user_svc_set_initial_user (user_id|1)
150104 car_user_svc_set_lifecycle_listener (uid|1),(package_name|3)
diff --git a/service/src/com/android/car/user/CarUserService.java b/service/src/com/android/car/user/CarUserService.java
index 7915cf5..07cf782 100644
--- a/service/src/com/android/car/user/CarUserService.java
+++ b/service/src/com/android/car/user/CarUserService.java
@@ -870,8 +870,6 @@
private void initBootUser(int requestType) {
boolean replaceGuest =
requestType == InitialUserInfoRequestType.RESUME && !mSwitchGuestUserBeforeSleep;
- EventLog.writeEvent(EventLogTags.CAR_USER_SVC_INITIAL_USER_INFO_REQ, requestType,
- mHalTimeoutMs);
checkManageUsersPermission("startInitialUser");
if (!isUserHalSupported()) {
@@ -882,6 +880,11 @@
}
UsersInfo usersInfo = UserHalHelper.newUsersInfo(mUserManager);
+
+ EventLog.writeEvent(EventLogTags.CAR_USER_SVC_INITIAL_USER_INFO_REQ, requestType,
+ mHalTimeoutMs, usersInfo.currentUser.userId, usersInfo.currentUser.flags,
+ usersInfo.numberUsers);
+
mHal.getInitialUserInfo(requestType, mHalTimeoutMs, usersInfo, (status, resp) -> {
if (resp != null) {
EventLog.writeEvent(EventLogTags.CAR_USER_SVC_INITIAL_USER_INFO_RESP,