Merge "unbindBackupAgent and initialize inFullBackup"

am: 36654ffef5 Change-Id: I5ba75075e2fb2dae0dcabbb0cee3b83c3d0c15ea
2017-01-24 23:38:12 +00:00
parent 8e9cf51db3 36654ffef5
commit 3a13bb43f6
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
@@ -17486,6 +17486,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) {