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

Commit 9faaf541 authored by Chris Tate's avatar Chris Tate Committed by Android (Google) Code Review
Browse files

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

parents f8af3436 09893e9a

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