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

Commit 760c1f55 authored by Bernardo Rufino's avatar Bernardo Rufino
Browse files

Bmgr about running backups 

Says that backups can be canceled if one already running. Put message
for running backups in dumpsys for checking.

Bug: 72484277
Test: Triggered backup, checked dumpsys and bmgr backupnow
Change-Id: I028cf663858e374389f50175aaf5a3e8c9d45e42
parent 53346e39

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());