commit 3b913d7a521f7cc6f5377e879ff802256b668e65
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 05 18:13:48 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 05 18:13:48 2019 +0000
tree 2b3aed04e2883228a0518a016a25865d61f90bf6
parent 1dbd55b6b09326acdbeccc4168aed4aedb372fb3
parent cc879eed4885c33911207d134e2b9e6208de463f

Merge "Add nullability to ScrollView#scrollToDescendant."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 58e2a79..56cf517 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -56788,7 +56788,7 @@
     method public boolean isFillViewport();
     method public boolean isSmoothScrollingEnabled();
     method public boolean pageScroll(int);
-    method public void scrollToDescendant(android.view.View);
+    method public void scrollToDescendant(@NonNull android.view.View);
     method public void setBottomEdgeEffectColor(@ColorInt int);
     method public void setEdgeEffectColor(@ColorInt int);
     method public void setFillViewport(boolean);

core/java/android/widget/ScrollView.java

diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 457be34..a3e89c8 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -1474,7 +1474,7 @@
      *
      * @param child the View to scroll to
      */
-    public void scrollToDescendant(View child) {
+    public void scrollToDescendant(@NonNull View child) {
         if (!mIsLayoutDirty) {
             child.getDrawingRect(mTempRect);