Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc

am: eedd2b529d

Change-Id: Ica176cd4b1bf569dfa03bdcefac622deddb57eca

1 files changed, 1 insertions, 1 deletions

diff --git a/core/java/com/android/internal/app/procstats/ProcessState.java b/core/java/com/android/internal/app/procstats/ProcessState.java
index 8c5df08f5499..8c2c2362f994 100644
--- a/core/java/com/android/internal/app/procstats/ProcessState.java
+++ b/core/java/com/android/internal/app/procstats/ProcessState.java
@@ -379,7 +379,7 @@ public final class ProcessState {
 
     public void setState(int state, long now) {
         ensureNotDead();
-        if (mCurState != state) {
+        if (!mDead && (mCurState != state)) {
             //Slog.i(TAG, "Setting state in " + mName + "/" + mPackage + ": " + state);
             commitStateTime(now);
             mCurState = state;