Merge cherrypicks of ['googleplex-android-review.googlesource.com/27016226'] into 24Q3-release. (c59cfd9a) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/BackupManagerService.java

+10 −12

Original line number	Diff line number	Diff line
		@@ -1516,7 +1516,7 @@ public class BackupManagerService extends IBackupManager.Stub {
		String op = nextArg(args, argIndex);
		argIndex++;

		if ("--help".equals(op)) {
		if ("--help".equals(op) \|\| "-h".equals(op)) {
		showDumpUsage(pw);
		return;
		}
		@@ -1548,8 +1548,10 @@ public class BackupManagerService extends IBackupManager.Stub {
		}
		return;
		}
		if (op == null \|\| "agents".startsWith(op) \|\| "transportclients".equals(op)
		\|\| "transportstats".equals(op)) {

		// We get here if we have no parameters or parameters unkonwn to us.
		// Print dumpsys info in either case: bug report creation passes some parameter to
		// dumpsys that we don't need to check.
		for (int i = 0; i < mUserServices.size(); i++) {
		UserBackupManagerService userBackupManagerService =
		getServiceForUserIfCallerHasPermission(mUserServices.keyAt(i), "dump()");
		@@ -1557,10 +1559,6 @@ public class BackupManagerService extends IBackupManager.Stub {
		userBackupManagerService.dump(fd, pw, args);
		}
		}
		return;
		}

		showDumpUsage(pw);
		}

		private String nextArg(String[] args, int argIndex) {