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

Merge "Merge "When fork() fails, clean up data structures." into nyc-dev am: f10640adef am: 01e97ab88e" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 69f17e7053

* commit '69f17e70531a77f9637ecaf7c0a42efd04172252':
  When fork() fails, clean up data structures.

Change-Id: I7820d4431877949e53543c929991b8175b951159
This commit is contained in:
Jeff Sharkey
2016-05-02 22:27:49 +00:00
committed by android-build-merger
parent fc7aaba867 69f17e7053
commit 3765e0aa6a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3724,13 +3724,16 @@ public final class ActivityManagerService extends ActivityManagerNative
}
checkTime(startTime, "startProcess: done updating pids map");
} catch (RuntimeException e) {
// XXX do better error recovery.
app.setPid(0);
mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid);
if (app.isolated) {
mBatteryStatsService.removeIsolatedUid(app.uid, app.info.uid);
}
Slog.e(TAG, "Failure starting process " + app.processName, e);
// Something went very wrong while trying to start this process; one
// common case is when the package is frozen due to an active
// upgrade. To recover, clean up any active bookkeeping related to
// starting this process. (We already invoked this method once when
// the package was initially frozen through KILL_APPLICATION_MSG, so
// it doesn't hurt to use it again.)
forceStopPackageLocked(app.info.packageName, UserHandle.getAppId(app.uid), false,
false, true, false, false, UserHandle.getUserId(app.userId), "start failure");
}
}