diff options
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessList.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ProcessRecord.java | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java index 3d11c6843338..0615ecf029fa 100644 --- a/services/core/java/com/android/server/am/ProcessList.java +++ b/services/core/java/com/android/server/am/ProcessList.java @@ -3087,6 +3087,8 @@ public final class ProcessList { if (old == proc && proc.isPersistent()) { // We are re-adding a persistent process. Whatevs! Just leave it there. Slog.w(TAG, "Re-adding persistent process " + proc); + // Ensure that the mCrashing flag is cleared, since this is a restart + proc.resetCrashingOnRestart(); } else if (old != null) { if (old.isKilled()) { // The old process has been killed, we probably haven't had diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java index cfbb5a5bc195..d8a269598bdc 100644 --- a/services/core/java/com/android/server/am/ProcessRecord.java +++ b/services/core/java/com/android/server/am/ProcessRecord.java @@ -618,6 +618,10 @@ class ProcessRecord implements WindowProcessListener { mPkgList.put(_info.packageName, new ProcessStats.ProcessStateHolder(_info.longVersionCode)); } + void resetCrashingOnRestart() { + mErrorState.setCrashing(false); + } + @GuardedBy(anyOf = {"mService", "mProcLock"}) UidRecord getUidRecord() { return mUidRecord; |