summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christopher Wiley <wiley@google.com> 2016-10-10 22:31:33 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-10-10 22:31:33 +0000
commit6408e2e5ccef19ac52d18ed63bee8759820dba9d (patch)
treee5c5fef0f1bd33dbcd1e9027cd83da463f037376
parent2dc11c05006f18f4ef772eec20a71662f023eb6f (diff)
parent5c6740a30c2df5eb48a3cdca1ea355e5f113af2d (diff)
Merge "IndexOutOfBoundsException observed in ProcessStats"
-rw-r--r--core/java/com/android/internal/app/procstats/ProcessState.java2
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;