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

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

Browse Source
This commit is contained in:
Allen Su
2023-03-03 16:14:19 +00:00
committed by Android (Google) Code Review
parent a9ac5f5c88 840367b103
commit 4c8b08a086
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/java/android/graphics/text/LineBreaker.java
View File

@@ -22,7 +22,6 @@ import android.annotation.IntRange;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.Px; import android.annotation.Px;
import android.os.Trace;
import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative; import dalvik.annotation.optimization.FastNative;
@@ -476,10 +475,7 @@ public class LineBreaker {
@NonNull MeasuredText measuredPara, @NonNull MeasuredText measuredPara,
@NonNull ParagraphConstraints constraints, @NonNull ParagraphConstraints constraints,
@IntRange(from = 0) int lineNumber) { @IntRange(from = 0) int lineNumber) {
Trace.traceBegin(Trace.TRACE_TAG_VIEW, "compute line break"); return new Result(nComputeLineBreaks(
long result = 0;
try {
result = nComputeLineBreaks(
mNativePtr, mNativePtr,
// Inputs // Inputs
@@ -491,11 +487,7 @@ public class LineBreaker {
constraints.mWidth, constraints.mWidth,
constraints.mVariableTabStops, constraints.mVariableTabStops,
constraints.mDefaultTabStop, constraints.mDefaultTabStop,
lineNumber); lineNumber));
} finally {
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
return new Result(result);
} }
@FastNative @FastNative