Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9371be3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Bmgr about running backups"

parents 8ab50a9e 760c1f55

cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java

+5 −1
Original line number Diff line number Diff line
@@ -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";

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -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());