Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 29e0b6e789

* commit '29e0b6e7891091614a9e9dd6083017d0c9d454ae':
  StrictMode: fix deserialization of ViolationInfo on large stacks
This commit is contained in:
Jeff Sharkey
2015-12-03 17:06:24 +00:00
committed by android-build-merger
parent 678011854b 29e0b6e789
commit af588a31bc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/StrictMode.java
View File

@@ -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();