Merge "Added content of mUserIds and mUserStates to 'dumpsys user'"

This commit is contained in:
TreeHugger Robot
2020-08-06 22:48:25 +00:00
committed by Android (Google) Code Review

View File

@@ -134,6 +134,7 @@ import java.io.OutputStream;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -4784,7 +4785,7 @@ public class UserManagerService extends IUserManager.Stub {
}
}
}
pw.println();
pw.println("Device properties:");
pw.println(" Device owner id:" + mDeviceOwnerUserId);
pw.println();
@@ -4801,8 +4802,26 @@ public class UserManagerService extends IUserManager.Stub {
}
}
synchronized (mUserStates) {
pw.println(" Started users state: " + mUserStates);
pw.print(" Started users state: [");
final int size = mUserStates.states.size();
for (int i = 0; i < size; i++) {
final int userId = mUserStates.states.keyAt(i);
final int state = mUserStates.states.valueAt(i);
pw.print(userId);
pw.print('=');
pw.print(UserState.stateToString(state));
if (i != size - 1) pw.print(", ");
}
pw.println(']');
}
synchronized (mUsersLock) {
pw.println();
pw.print("Cached user IDs: ");
pw.println(Arrays.toString(mUserIds));
pw.println();
}
} // synchronized (mPackagesLock)
// Dump some capabilities