Merge "Do not re-use dead shared isolated processes." into main
diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java
index 71cbc10..a58d850 100644
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -5845,7 +5845,7 @@
if (r.inSharedIsolatedProcess) {
app = mAm.mProcessList.getSharedIsolatedProcess(procName, r.appInfo.uid,
r.appInfo.packageName);
- if (app != null) {
+ if (app != null && !app.isKilled()) {
final IApplicationThread thread = app.getThread();
final int pid = app.getPid();
final UidRecord uidRecord = app.getUidRecord();
@@ -5870,6 +5870,8 @@
// If a dead object exception was thrown -- fall through to
// restart the application.
}
+ } else {
+ app = null;
}
} else {
// If this service runs in an isolated process, then each time