diff options
| author | Alan Viverette <alanv@google.com> | 2016-03-11 18:42:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-11 18:42:43 +0000 |
| commit | 79936ddda4c8d1709f736cda013070c3ab32db6f (patch) | |
| tree | 30cf5c59d3c95734062626bf4b20abf560d9ad30 /core/java/android/widget/ImageView.java | |
| parent | 44dbe294fbf06a1def61c48e758621e61ce23b08 (diff) | |
| parent | f6d87ec193f17e8dad82c9994ba7a58e975d364b (diff) | |
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
Diffstat (limited to 'core/java/android/widget/ImageView.java')
| -rw-r--r-- | core/java/android/widget/ImageView.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index f601f7df1fa8..3400873896f8 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -212,7 +212,7 @@ public class ImageView extends View { } @Override - protected boolean verifyDrawable(Drawable dr) { + protected boolean verifyDrawable(@NonNull Drawable dr) { return mDrawable == dr || super.verifyDrawable(dr); } @@ -223,7 +223,7 @@ public class ImageView extends View { } @Override - public void invalidateDrawable(Drawable dr) { + public void invalidateDrawable(@NonNull Drawable dr) { if (dr == mDrawable) { if (dr != null) { // update cached drawable dimensions if they've changed |