Merge "StrictMode: fix deserialization of ViolationInfo on large stacks"

core/java/android/os/StrictMode.java

@@ -1931,9 +1931,9 @@ public final class StrictMode {
                 // so we'll report it and bail on all of the current strict mode violations
                 // we currently are maintaining for this thread.
                 // First, drain the remaining violations from the parcel.
-                while (i < numViolations) {
+                i++;  // Skip the current entry.
+                for (; i < numViolations; i++) {
                     info = new ViolationInfo(p, !currentlyGathering);
-                    i++;
                 }
                 // Next clear out all gathered violations.
                 clearGatheredViolations();