Merge "MediaBrowser: Copy options before calling subscribeInternal()" into nyc-dev

2016-03-09 07:41:49 +00:00
parent 1f849da6f2 df91a67953
commit 33441e7f2a
1 changed files with 2 additions and 2 deletions
--- 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) {