Commit b6b6c018 authored Mar 08, 2018 by Fyodor Kupolov Committed by Android (Google) Code Review Mar 08, 2018

Merge changes from topic "am-74e79eb6-59c1-4f9c-a993-72eeee3859c4" into oc-dev

* changes:
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e4 am: 71478241 am: e0b5c2d2 am: fa32631c am: 3a295c1c
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e4 am: 71478241 am: e0b5c2d2 am: fa32631c
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e4 am: 71478241 am: e0b5c2d2
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e4 am: 71478241
  [automerger] Verify last array's length in readFromParcel am: 3b8bc2e4
  Verify last array's length in readFromParcel

parents 5d2153d1 286944d5

core/java/com/android/internal/app/procstats/SparseMappingTable.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.app.procstats;

		import android.os.Build;
		import android.os.Parcel;
		import android.util.EventLog;
		import android.util.Slog;
		import libcore.util.EmptyArray;

		@@ -529,6 +530,12 @@ public class SparseMappingTable {
		readCompactedLongArray(in, array, size);
		mLongs.add(array);
		}
		// Verify that last array's length is consistent with writeToParcel
		if (N > 0 && mLongs.get(N - 1).length != mNextIndex) {
		EventLog.writeEvent(0x534e4554, "73252178", -1, "");
		throw new IllegalStateException("Expected array of length " + mNextIndex + " but was "
		+ mLongs.get(N - 1).length);
		}
		}

		/**