From 1d2f763fa1c3ff7b499923abc547040d82279c95 Mon Sep 17 00:00:00 2001 From: Andrea Zilio Date: Fri, 19 Apr 2024 14:57:03 +0000 Subject: Re-enable backup dumpsys in bugreports, and remove some behaviour change introduced after ag/26833810 Change-Id: I501151d4d73490b3f6f3c0326e741ec046cad36b --- .../server/backup/BackupManagerService.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'services/backup/java') diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 0353d5a962c7..5f0071d47c89 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -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,19 +1548,17 @@ public class BackupManagerService extends IBackupManager.Stub { } return; } - if (op == null || "agents".startsWith(op) || "transportclients".equals(op) - || "transportstats".equals(op)) { - for (int i = 0; i < mUserServices.size(); i++) { - UserBackupManagerService userBackupManagerService = - getServiceForUserIfCallerHasPermission(mUserServices.keyAt(i), "dump()"); - if (userBackupManagerService != null) { - userBackupManagerService.dump(fd, pw, args); - } + + // 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()"); + if (userBackupManagerService != null) { + userBackupManagerService.dump(fd, pw, args); } - return; } - - showDumpUsage(pw); } private String nextArg(String[] args, int argIndex) { -- cgit v1.2.3-59-g8ed1b