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

am: 9faaf5418a Change-Id: I786bc8d21571fbe456d80b38789fd5e141b3182a
2016-06-09 23:51:02 +00:00
parent e2b3248823 9faaf5418a
commit 75072f6f18
1 changed files with 5 additions and 1 deletions
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -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);