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

Commit b379ed3d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Check lineHeight without cast" into udc-dev am: cd819a4a am:... 

Merge "Merge "Check lineHeight without cast" into udc-dev am: cd819a4a am: 988c5d67" into udc-d1-dev-plus-aosp am: 63534567

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



Change-Id: I8a980012eac2aa6b539a5185118a6908b8bc5405
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d424315b 63534567

core/java/android/widget/TextView.java

+2 −1
Original line number Diff line number Diff line
@@ -6228,7 +6228,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }















    private void setLineHeightPx(@Px @FloatRange(from = 0) float lineHeight) {













        Preconditions.checkArgumentNonnegative((int) lineHeight);













        Preconditions.checkArgumentNonNegative(lineHeight,













                "Expecting non-negative lineHeight while the input is " + lineHeight);





























        final int fontHeight = getPaint().getFontMetricsInt(null);















        // Make sure we don't setLineSpacing if it's not needed to avoid unnecessary redraw.