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

Commit ee5bc654 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge \"Don\'t allow restore sessions during backups\" into nyc-dev 

am: 9faaf541

Change-Id: I68e844ee0710bc4125da7789c2059ab23262ba76
parents d567ae1b 9faaf541

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