commit fb6e4bc01b3af924fbca3c566bfac90a92a906b5
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 09 15:01:42 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 15:01:42 2018 +0000
tree 89c30bffe4384c2d4a6a9a73fa2aa0bbee091027
parent 71478241eb069f13cb1d1e9550d7bb35f8a8a121
parent 595f82f99ee2dc2b03e8c503ee11ffddc641121c

Merge changes from topic "am-af991497-a243-423d-8f58-f6bc1131a734" into nyc-dr1-dev

* changes:
  [automerger] [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids am: 41d8bf1fed
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids

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

diff --git a/core/java/com/android/internal/app/procstats/SparseMappingTable.java b/core/java/com/android/internal/app/procstats/SparseMappingTable.java
index f941836..6d79d3b 100644
--- a/core/java/com/android/internal/app/procstats/SparseMappingTable.java
+++ b/core/java/com/android/internal/app/procstats/SparseMappingTable.java
@@ -18,6 +18,7 @@
 
 import android.os.Build;
 import android.os.Parcel;
+import android.util.EventLog;
 import android.util.Slog;
 import libcore.util.EmptyArray;
 
@@ -529,6 +530,12 @@
             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);
+        }
     }
 
     /**