diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index ada0e2cc653fe..364215534d627 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -1116,7 +1116,7 @@ public final class MediaBrowser {
                 }
             }
             mCallbacks.add(callback);
-            mOptionsList.add(options);
+            mOptionsList.add(options == null ? null : new Bundle(options));
         }
 
         public boolean removeCallback(Bundle options) {