Merge "unbindBackupAgent and initialize inFullBackup" am: 36654ffef5 am: 3a13bb43f6

am: 6793b1f0b8 Change-Id: I16e1b48e818023243f2c05e43599432f59203a19
2017-01-24 23:46:58 +00:00
parent 17674b6115 6793b1f0b8
commit c8d9b32db8
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
@@ -17562,6 +17562,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) {