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

Merge "[ActivityManager] Avoid orphan ContentProviderRecord."

Browse Source
This commit is contained in:
Olawale Ogunwale
2015-04-24 17:42:58 +00:00
committed by Gerrit Code Review
parent 0e29681f98 5ed21bd9ac
commit cf7d2d95ad
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5816,17 +5816,20 @@ public final class ActivityManagerService extends ActivityManagerNative
if (app.isolated) {
mBatteryStatsService.removeIsolatedUid(app.uid, app.info.uid);
}
app.kill(reason, true);
handleAppDiedLocked(app, true, allowRestart);
removeLruProcessLocked(app);
boolean willRestart = false;
if (app.persistent && !app.isolated) {
if (!callerWillRestart) {
addAppLocked(app.info, false, null /* ABI override */);
willRestart = true;
} else {
needRestart = true;
}
}
app.kill(reason, true);
handleAppDiedLocked(app, willRestart, allowRestart);
if (willRestart) {
removeLruProcessLocked(app);
addAppLocked(app.info, false, null /* ABI override */);
}
} else {
mRemovedProcesses.add(app);
}