Merge "Add metrics domain for Bluetooth" into qt-qpr1-dev
diff --git a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
index 0745945..72332d9 100644
--- a/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
+++ b/user/car-user-lib/src/android/car/userlib/CarUserManagerHelper.java
@@ -238,10 +238,8 @@
// If an override user is present and a real user, return it
if (bootUserOverride != BOOT_USER_NOT_FOUND
&& allUsers.contains(bootUserOverride)) {
- if (Log.isLoggable(TAG, Log.DEBUG)) {
- Log.d(TAG, "Boot user id override found for initial user, user id: "
- + bootUserOverride);
- }
+ Log.i(TAG, "Boot user id override found for initial user, user id: "
+ + bootUserOverride);
return bootUserOverride;
}
@@ -249,19 +247,15 @@
int lastActiveUser = getLastActiveUser();
if (lastActiveUser != UserHandle.USER_SYSTEM
&& allUsers.contains(lastActiveUser)) {
- if (Log.isLoggable(TAG, Log.DEBUG)) {
- Log.d(TAG, "Last active user loaded for initial user, user id: "
- + lastActiveUser);
- }
+ Log.i(TAG, "Last active user loaded for initial user, user id: "
+ + lastActiveUser);
return lastActiveUser;
}
// If all else fails, return the smallest user id
int returnId = Collections.min(allUsers);
- if (Log.isLoggable(TAG, Log.DEBUG)) {
- Log.d(TAG, "Saved ids were invalid. Returning smallest user id, user id: "
- + returnId);
- }
+ Log.i(TAG, "Saved ids were invalid. Returning smallest user id, user id: "
+ + returnId);
return returnId;
}