Merge "Dump all users when `dumpsys overlay` is invoked" (015302cf) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/om/OverlayManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -752,7 +752,7 @@ public final class OverlayManagerService extends SystemService {
		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		final DumpState dumpState = new DumpState();
		dumpState.setUserId(UserHandle.getUserId(Binder.getCallingUid()));
		dumpState.setUserId(UserHandle.USER_ALL);

		int opti = 0;
		while (opti < args.length) {
		@@ -772,13 +772,13 @@ public final class OverlayManagerService extends SystemService {
		pw.println(" so the following are equivalent: mState, mstate, State, state.");
		return;
		} else if ("--user".equals(opt)) {
		opti++;
		if (opti >= args.length) {
		pw.println("Error: user missing argument");
		return;
		}
		try {
		dumpState.setUserId(Integer.parseInt(args[opti]));
		opti++;
		} catch (NumberFormatException e) {
		pw.println("Error: user argument is not a number: " + args[opti]);
		return;