Merge "IndexOutOfBoundsException observed in ProcessStats" (b6593f15) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ProcessStats.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -2351,6 +2351,9 @@ public final class ProcessStats implements Parcelable {
		mDurationsTable = mStats.mAddLongTable;
		mDurationsTableSize = mStats.mAddLongTableSize;
		}
		if (((off>>OFFSET_ARRAY_SHIFT)&OFFSET_ARRAY_MASK) >= mStats.mLongs.size()) {
		return;
		}
		long[] longs = mStats.mLongs.get((off>>OFFSET_ARRAY_SHIFT)&OFFSET_ARRAY_MASK);
		if (DEBUG) Slog.d(TAG, "Duration of " + mName + " state " + state + " inc by " + dur
		+ " from " + longs[(off>>OFFSET_INDEX_SHIFT)&OFFSET_INDEX_MASK]);
		@@ -2717,6 +2720,9 @@ public final class ProcessStats implements Parcelable {
		mPssTable = mStats.mAddLongTable;
		mPssTableSize = mStats.mAddLongTableSize;
		}
		if (((off>>OFFSET_ARRAY_SHIFT)&OFFSET_ARRAY_MASK) >= mStats.mLongs.size()) {
		return;
		}
		long[] longs = mStats.mLongs.get((off>>OFFSET_ARRAY_SHIFT)&OFFSET_ARRAY_MASK);
		idx = (off>>OFFSET_INDEX_SHIFT)&OFFSET_INDEX_MASK;
		long count = longs[idx+PSS_SAMPLE_COUNT];