Merge "IndexOutOfBoundsException observed in ProcessStats" am: 6408e2e5cc am: eedd2b529d am: 53d12379f4

am: 5f9fedc5d7

Change-Id: Id23911d3ff1e90cf88711a7aa7749acdd81a26ae

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;