diff options
| -rw-r--r-- | cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java | 6 | ||||
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index e87a78e20d14..84a04e5ad6e3 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -297,6 +297,10 @@ public final class Bmgr { super.backupFinished(status); System.out.println("Backup finished with result: " + convertBackupStatusToString(status)); + if (status == BackupManager.ERROR_BACKUP_CANCELLED) { + System.out.println("Backups can be cancelled if a backup is already running, check " + + "backup dumpsys"); + } } } @@ -318,7 +322,7 @@ public final class Bmgr { case BackupManager.ERROR_TRANSPORT_QUOTA_EXCEEDED: return "Size quota exceeded"; case BackupManager.ERROR_BACKUP_CANCELLED: - return "Backup Cancelled"; + return "Backup cancelled"; default: return "Unknown error"; } diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 782bf71bf9bb..369df540581a 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -3555,6 +3555,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { + (this.mPendingInits.size() == 0 ? "not " : "") + "pending init"); pw.println("Auto-restore is " + (mAutoRestore ? "enabled" : "disabled")); if (mBackupRunning) pw.println("Backup currently running"); + pw.println(isBackupOperationInProgress() ? "Backup in progress" : "No backups running"); pw.println("Last backup pass started: " + mLastBackupPass + " (now = " + System.currentTimeMillis() + ')'); pw.println(" next scheduled: " + KeyValueBackupJob.nextScheduled()); |