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

Commit 1c06abe4 authored by Haoyu Zhang's avatar Haoyu Zhang Committed by Android (Google) Code Review
Browse files

Merge "Add NonNull annotaion for LineHeightSpan.Standard"

parents 615f2602 7c894609

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -47110,7 +47110,7 @@ package android.text.style { 














  public static class LineHeightSpan.Standard implements android.text.style.LineHeightSpan android.text.ParcelableSpan {















    ctor public LineHeightSpan.Standard(@Px @IntRange(from=1) int);













    ctor public LineHeightSpan.Standard(android.os.Parcel);













    ctor public LineHeightSpan.Standard(@NonNull android.os.Parcel);















    method public void chooseHeight(@NonNull CharSequence, int, int, int, int, @NonNull android.graphics.Paint.FontMetricsInt);















    method public int describeContents();















    method @Px public int getHeight();

























core/java/android/text/style/LineHeightSpan.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -88,7 +88,7 @@ public interface LineHeightSpan extends ParagraphStyle, WrapTogetherSpan {













        /**















         * Constructor called from {@link TextUtils} to restore the span from a parcel















         */













        public Standard(Parcel src) {













        public Standard(@NonNull Parcel src) {















            mHeight = src.readInt();















        }