Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5cefab2 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 29e0b6e7

* commit '29e0b6e7':
  StrictMode: fix deserialization of ViolationInfo on large stacks
parents 67801185 29e0b6e7

core/java/android/os/StrictMode.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1931,9 +1931,9 @@ public final class StrictMode { 
                // so we'll report it and bail on all of the current strict mode violations

                // so we'll report it and bail on all of the current strict mode violations

                // we currently are maintaining for this thread.

                // we currently are maintaining for this thread.

                // First, drain the remaining violations from the parcel.

                // 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);

                    info = new ViolationInfo(p, !currentlyGathering);

                    i++;

                }

                }

                // Next clear out all gathered violations.

                // Next clear out all gathered violations.

                clearGatheredViolations();

                clearGatheredViolations();