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

Commit a2cc0c2c authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "Frameworks/base: Use Log.printlns in RuntimeInit" into nyc-dev

parents ea3aa1bc d888beb9

core/java/android/util/Log.java

+2 −1
Original line number Diff line number Diff line
@@ -377,8 +377,9 @@ public final class Log { 
     * Helper function for long messages. Uses the LineBreakBufferedWriter to break

     * up long messages and stacktraces along newlines, but tries to write in large

     * chunks. This is to avoid truncation.

     * @hide

     */

    private static int printlns(int bufID, int priority, String tag, String msg,

    public static int printlns(int bufID, int priority, String tag, String msg,

            Throwable tr) {

        ImmediateLogWriter logWriter = new ImmediateLogWriter(bufID, priority, tag);

        // Acceptable buffer size. Get the native buffer size, subtract two zero terminators,

core/java/com/android/internal/os/RuntimeInit.java

+1 −2
Original line number Diff line number Diff line
@@ -57,8 +57,7 @@ public class RuntimeInit { 
    private static final native void nativeSetExitWithoutCleanup(boolean exitWithoutCleanup);



    private static int Clog_e(String tag, String msg, Throwable tr) {

        return Log.println_native(Log.LOG_ID_CRASH, Log.ERROR, tag,

                msg + '\n' + Log.getStackTraceString(tr));

        return Log.printlns(Log.LOG_ID_CRASH, Log.ERROR, tag, msg, tr);

    }



    /**