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

Merge "Fills font metrics before passing to ReplacementSpan" into pi-dev

Browse Source 
am: 138148425c

Change-Id: I25a8114a246c7c0a244e2ee69f9efd58b5dbd6f9
This commit is contained in:
Seigo Nonaka
2018-04-02 19:31:33 +00:00
committed by android-build-merger
parent 469a4ce1d2 138148425c
commit f0a302f119
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/text/MeasuredParagraph.java
View File

@@ -540,9 +540,6 @@ public class MeasuredParagraph {
private void applyStyleRun(@IntRange(from = 0) int start, // inclusive, in copied buffer
@IntRange(from = 0) int end, // exclusive, in copied buffer
/* Maybe Zero */ long nativeBuilderPtr) {
if (nativeBuilderPtr != 0) {
mCachedPaint.getFontMetricsInt(mCachedFm);
}
if (mLtrWithoutBidi) {
// If the whole text is LTR direction, just apply whole region.
@@ -614,6 +611,10 @@ public class MeasuredParagraph {
final int startInCopiedBuffer = start - mTextStart;
final int endInCopiedBuffer = end - mTextStart;
if (nativeBuilderPtr != 0) {
mCachedPaint.getFontMetricsInt(mCachedFm);
}
if (replacement != null) {
applyReplacementRun(replacement, startInCopiedBuffer, endInCopiedBuffer,
nativeBuilderPtr);