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

Commit b7412897 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #21254610: StrictMode uses Log.wtf which crashes apps on L+" into mnc-dev

parents 6af40c83 fde298e7

core/java/android/os/StrictMode.java

+2 −2
Original line number Diff line number Diff line
@@ -1919,9 +1919,9 @@ public final class StrictMode { 
        for (int i = 0; i < numViolations; ++i) {

            if (LOG_V) Log.d(TAG, "strict mode violation stacks read from binder call.  i=" + i);

            ViolationInfo info = new ViolationInfo(p, !currentlyGathering);

            if (info.crashInfo.stackTrace != null && info.crashInfo.stackTrace.length() > 10000) {

            if (info.crashInfo.stackTrace != null && info.crashInfo.stackTrace.length() > 30000) {

                String front = info.crashInfo.stackTrace.substring(256);

                // 10000 characters is way too large for this to be any sane kind of

                // 30000 characters is way too large for this to be any sane kind of

                // strict mode collection of stacks.  We've had a problem where we leave

                // strict mode violations associated with the thread, and it keeps tacking

                // more and more stacks on to the violations.  Looks like we're in this casse,