From f6d87ec193f17e8dad82c9994ba7a58e975d364b Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Fri, 11 Mar 2016 10:09:14 -0500 Subject: Add consistent @NonNull annotations for drawable callbacks Bug: 27599515 Change-Id: I33fdc5392302403bfff9cc74a8226173ec962af6 --- core/java/android/widget/ImageView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/java/android/widget/ImageView.java') 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 -- cgit v1.2.3