diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-28 18:42:56 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-28 18:42:56 +0000 |
commit | 23480d886e51c77f73088507cb0de79be4ad6dfc (patch) | |
tree | 8ef24d018b39de613fb4222fdf41187b16786eaf | |
parent | a6b8cfe0349d8af1418ae21ef58c6d88f797f2b4 (diff) | |
parent | aa587672e512c9ba830c79a621fd5d4424256108 (diff) | |
download | base-linaro-o-boottime.tar.gz |
Merge cherrypicks of [2805728, 2805966] into oc-r5-releaseandroid-8.0.0_r17linaro-o-boottime
Change-Id: I6062dd3859b7db54443bb63c7f2a7641c16b255b
-rw-r--r-- | media/java/android/media/MediaDescription.java | 27 | ||||
-rw-r--r-- | media/java/android/media/session/MediaSession.java | 23 |
2 files changed, 50 insertions, 0 deletions
diff --git a/media/java/android/media/MediaDescription.java b/media/java/android/media/MediaDescription.java index 14485d3c43a3..e6aea99ef50b 100644 --- a/media/java/android/media/MediaDescription.java +++ b/media/java/android/media/MediaDescription.java @@ -220,6 +220,33 @@ public class MediaDescription implements Parcelable { } @Override + public boolean equals(Object o) { + if (o == null) { + return false; + } + + if (!(o instanceof MediaDescription)){ + return false; + } + + final MediaDescription d = (MediaDescription) o; + + if (!String.valueOf(mTitle).equals(String.valueOf(d.mTitle))) { + return false; + } + + if (!String.valueOf(mSubtitle).equals(String.valueOf(d.mSubtitle))) { + return false; + } + + if (!String.valueOf(mDescription).equals(String.valueOf(d.mDescription))) { + return false; + } + + return true; + } + + @Override public String toString() { return mTitle + ", " + mSubtitle + ", " + mDescription; } diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index dfd2bb35d6ea..9536d3d35206 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -48,6 +48,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.ref.WeakReference; import java.util.List; +import java.util.Objects; /** * Allows interaction with media controllers, volume keys, media buttons, and @@ -1256,6 +1257,28 @@ public final class MediaSession { "Description=" + mDescription + ", Id=" + mId + " }"; } + + @Override + public boolean equals(Object o) { + if (o == null) { + return false; + } + + if (!(o instanceof QueueItem)) { + return false; + } + + final QueueItem item = (QueueItem) o; + if (mId != item.mId) { + return false; + } + + if (!Objects.equals(mDescription, item.mDescription)) { + return false; + } + + return true; + } } private static final class Command { |