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

Commit 3f8c9e4c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Media API: fix possible NPE"

parents 291672cc ab61a5af

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

+6 −2
Original line number Diff line number Diff line
@@ -1134,7 +1134,9 @@ public final class MediaBrowser { 
        }



        public SubscriptionCallback getCallback(Context context, Bundle options) {

            if (options != null) {

                options.setClassLoader(context.getClassLoader());

            }

            for (int i = 0; i < mOptionsList.size(); ++i) {

                if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {

                    return mCallbacks.get(i);
@@ -1144,7 +1146,9 @@ public final class MediaBrowser { 
        }



        public void putCallback(Context context, Bundle options, SubscriptionCallback callback) {

            if (options != null) {

                options.setClassLoader(context.getClassLoader());

            }

            for (int i = 0; i < mOptionsList.size(); ++i) {

                if (MediaBrowserUtils.areSameOptions(mOptionsList.get(i), options)) {

                    mCallbacks.set(i, callback);