summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sungsoo Lim <sungsoo@google.com> 2016-03-09 15:59:01 +0900
committer Sungsoo Lim <sungsoo@google.com> 2016-03-09 16:03:23 +0900
commitdf91a67953d1a2fbcbb785e8813189ace4ddd5ee (patch)
tree5a0bc476c85d633ff162271db5a9fc64e0f453d1
parentf52ebd119e76187366e9f9d0f388fbdef46a33c8 (diff)
MediaBrowser: Copy options before calling subscribeInternal()
If MediaBrowser and MediaBrowserService are on the same process, the options object could be shared. Bug: 27398805 Change-Id: I61ce63f667e46229662d85cd6f417b104f9d1388
-rw-r--r--media/java/android/media/browse/MediaBrowser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index 364215534d62..fe2796caf700 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -365,7 +365,7 @@ public final class MediaBrowser {
if (options == null) {
throw new IllegalArgumentException("options are null");
}
- subscribeInternal(parentId, options, callback);
+ subscribeInternal(parentId, new Bundle(options), callback);
}
/**
@@ -1116,7 +1116,7 @@ public final class MediaBrowser {
}
}
mCallbacks.add(callback);
- mOptionsList.add(options == null ? null : new Bundle(options));
+ mOptionsList.add(options);
}
public boolean removeCallback(Bundle options) {