Merge "unbindBackupAgent and initialize inFullBackup" am: 36654ffef5

am: 3a13bb43f6 Change-Id: I44fcb1ff849d39ff528adb85f8d76563eb9b9d52
2017-01-24 23:42:33 +00:00
parent 3cd1f5bac7 3a13bb43f6
commit 6793b1f0b8
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -17549,6 +17549,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                // Not backing this app up any more; reset its OOM adjustment
                final ProcessRecord proc = mBackupTarget.app;
                updateOomAdjLocked(proc);
+                proc.inFullBackup = false;

                // If the app crashed during backup, 'thread' will be null here
                if (proc.thread != null) {