Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 6793b1f0b8

Change-Id: I16e1b48e818023243f2c05e43599432f59203a19
This commit is contained in:
Chris Tate
2017-01-24 23:46:58 +00:00
committed by android-build-merger
parent 17674b6115 6793b1f0b8
commit c8d9b32db8
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -17562,6 +17562,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// Not backing this app up any more; reset its OOM adjustment // Not backing this app up any more; reset its OOM adjustment
final ProcessRecord proc = mBackupTarget.app; final ProcessRecord proc = mBackupTarget.app;
updateOomAdjLocked(proc); updateOomAdjLocked(proc);
proc.inFullBackup = false;
// If the app crashed during backup, 'thread' will be null here // If the app crashed during backup, 'thread' will be null here
if (proc.thread != null) { if (proc.thread != null) {