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/app/MediaRouteButton.java | |
| parent | 44dbe294fbf06a1def61c48e758621e61ce23b08 (diff) | |
| parent | f6d87ec193f17e8dad82c9994ba7a58e975d364b (diff) | |
Merge "Add consistent @NonNull annotations for drawable callbacks" into nyc-dev
Diffstat (limited to 'core/java/android/app/MediaRouteButton.java')
| -rw-r--r-- | core/java/android/app/MediaRouteButton.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java index 181c90758e8e..70a5e15c6c27 100644 --- a/core/java/android/app/MediaRouteButton.java +++ b/core/java/android/app/MediaRouteButton.java @@ -19,6 +19,7 @@ package android.app; import com.android.internal.R; import com.android.internal.app.MediaRouteDialogPresenter; +import android.annotation.NonNull; import android.content.Context; import android.content.ContextWrapper; import android.content.res.TypedArray; @@ -279,7 +280,7 @@ public class MediaRouteButton extends View { } @Override - protected boolean verifyDrawable(Drawable who) { + protected boolean verifyDrawable(@NonNull Drawable who) { return super.verifyDrawable(who) || who == mRemoteIndicator; } |