Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eef1c123 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by android-build-merger
Browse files

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

am: 33441e7f

* commit '33441e7f':
  MediaBrowser: Copy options before calling subscribeInternal()
parents fa5ecaf3 33441e7f

media/java/android/media/browse/MediaBrowser.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {