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

Commit 70e23e0d authored by Christopher Ferris's avatar Christopher Ferris
Browse files

Change wtf errors from ASSERT to ERROR. 

Calling println_native with the value of ASSERT will set the abort
message. Unfortunately, there are numerous cases where one thread aborts,
but before that thread can communicate with debuggerd, another thread
calls wtf, which overwrites the abort message from the original
failing thread.

Fix this by changing this to an error level log message.

Bug: 21490722
(cherry picked from commit 2d073ba8)

Change-Id: Ib9daedf114a2e0ecc424641e4929cc4d15b0c776
parent c521b108

core/java/android/util/Log.java

+4 −1
Original line number Diff line number Diff line
@@ -289,7 +289,10 @@ public final class Log { 
    static int wtf(int logId, String tag, String msg, Throwable tr, boolean localStack,

            boolean system) {

        TerribleFailure what = new TerribleFailure(msg, tr);

        int bytes = println_native(logId, ASSERT, tag, msg + '\n'

        // Only mark this as ERROR, do not use ASSERT since that should be

        // reserved for cases where the system is guaranteed to abort.

        // The onTerribleFailure call does not always cause a crash.

        int bytes = println_native(logId, ERROR, tag, msg + '\n'

                + getStackTraceString(localStack ? what : tr));

        sWtfHandler.onTerribleFailure(tag, what, system);

        return bytes;