commit 1c06abe487620c978c94f82b9500414946e5577e
author Haoyu Zhang <haoyuchang@google.com> Tue Mar 05 00:55:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 00:55:44 2019 +0000
tree c5c8fb4642d6a1ba1647aa661a72dd81ca31f2dc
parent 615f2602d50beb933dbb25f2c196ae830d247964
parent 7c894609673802377b61557e558e8c615d85ce0c

Merge "Add NonNull annotaion for LineHeightSpan.Standard"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index bc7ae3c..4e533d1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -47110,7 +47110,7 @@
 
   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

diff --git a/core/java/android/text/style/LineHeightSpan.java b/core/java/android/text/style/LineHeightSpan.java
index a5d5af2..7fb0f95 100644
--- a/core/java/android/text/style/LineHeightSpan.java
+++ b/core/java/android/text/style/LineHeightSpan.java
@@ -88,7 +88,7 @@
         /**
          * Constructor called from {@link TextUtils} to restore the span from a parcel
          */
-        public Standard(Parcel src) {
+        public Standard(@NonNull Parcel src) {
             mHeight = src.readInt();
         }