Merge "unbindBackupAgent and initialize inFullBackup"

2017-01-24 23:31:34 +00:00
parent a9c27b348c 17e1d9844d
commit 36654ffef5
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
@@ -17491,6 +17491,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) {