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

Commit 24bb54d7 authored by Chris Tate's avatar Chris Tate Committed by android-build-merger
Browse files

Merge \\"Don\\'t allow restore sessions during backups\\" into nyc-dev am: 9faaf541 

am: ee5bc654

Change-Id: I9419a06ccc64b0927051416ddc734106d26c562a
parents f74ddf56 ee5bc654

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

+5 −1
Original line number Diff line number Diff line
@@ -9849,7 +9849,11 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 


        synchronized(this) {

            if (mActiveRestoreSession != null) {

                Slog.d(TAG, "Restore session requested but one already active");

                Slog.i(TAG, "Restore session requested but one already active");

                return null;

            }

            if (mBackupRunning) {

                Slog.i(TAG, "Restore session requested but currently running backups");

                return null;

            }

            mActiveRestoreSession = new ActiveRestoreSession(packageName, transport);