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

graphics/java/android/graphics/text/LineBreaker.java

@@ -22,6 +22,7 @@ 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;
@@ -475,19 +476,26 @@ public class LineBreaker {
             @NonNull MeasuredText measuredPara,
             @NonNull ParagraphConstraints constraints,
             @IntRange(from = 0) int lineNumber) {
-        return new Result(nComputeLineBreaks(
-                mNativePtr,
+        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "compute line break");
+        long result = 0;
+        try {
+            result = nComputeLineBreaks(
+                    mNativePtr,
 
-                // Inputs
-                measuredPara.getChars(),
-                measuredPara.getNativePtr(),
-                measuredPara.getChars().length,
-                constraints.mFirstWidth,
-                constraints.mFirstWidthLineCount,
-                constraints.mWidth,
-                constraints.mVariableTabStops,
-                constraints.mDefaultTabStop,
-                lineNumber));
+                    // 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);
     }
 
     @FastNative