From ab61a5af0b9b1949faba3fcc3bfe2909067fb194 Mon Sep 17 00:00:00 2001 From: Conrad Chen Date: Thu, 20 Jul 2017 11:43:03 -0700 Subject: [PATCH] Media API: fix possible NPE Test: cts-tradefed run cts -m MediaTest Change-Id: I077bdef97e48aa793a82a109e17c6dbe3147a3a9 --- media/java/android/media/browse/MediaBrowser.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java index 54be8fde9be48..986256406c4c6 100644 --- a/media/java/android/media/browse/MediaBrowser.java +++ b/media/java/android/media/browse/MediaBrowser.java @@ -1134,7 +1134,9 @@ public final class MediaBrowser { } public SubscriptionCallback getCallback(Context context, Bundle options) { - options.setClassLoader(context.getClassLoader()); + 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) { - options.setClassLoader(context.getClassLoader()); + 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);