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 am: 4c8b08a086

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21733969

Change-Id: Icf8d7653c755db652419f9d7170065e6096174af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Allen Su
2023-03-03 18:47:13 +00:00
committed by Automerger Merge Worker
parent 6fedd5c331 4c8b08a086
commit e0ce9b2a27
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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,26 +475,19 @@ 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(
mNativePtr,
return new Result(nComputeLineBreaks(
mNativePtr,
// Inputs
measuredPara.getChars(),
measuredPara.getNativePtr(),
measuredPara.getChars().length,
constraints.mFirstWidth,
constraints.mFirstWidthLineCount,
constraints.mWidth,
constraints.mVariableTabStops,
constraints.mDefaultTabStop,
lineNumber);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_VIEW);
}
return new Result(result);
// Inputs
measuredPara.getChars(),
measuredPara.getNativePtr(),
measuredPara.getChars().length,
constraints.mFirstWidth,
constraints.mFirstWidthLineCount,
constraints.mWidth,
constraints.mVariableTabStops,
constraints.mDefaultTabStop,
lineNumber));
}
@FastNative