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

Commit 4c8b08a0 authored by Allen Su's avatar Allen Su Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add Trace for phrase breaking"" into udc-dev

parents a9ac5f5c 840367b1
Loading
Loading
Loading
Loading
+13 −21
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.Px;
import android.os.Trace;

import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative;
@@ -476,10 +475,7 @@ public class LineBreaker {
            @NonNull MeasuredText measuredPara,
            @NonNull ParagraphConstraints constraints,
            @IntRange(from = 0) int lineNumber) {
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "compute line break");
        long result = 0;
        try {
            result = nComputeLineBreaks(
        return new Result(nComputeLineBreaks(
                mNativePtr,

                // Inputs
@@ -491,11 +487,7 @@ public class LineBreaker {
                constraints.mWidth,
                constraints.mVariableTabStops,
                constraints.mDefaultTabStop,
                    lineNumber);
        } finally {
            Trace.traceEnd(Trace.TRACE_TAG_VIEW);
        }
        return new Result(result);
                lineNumber));
    }

    @FastNative