Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Media API: fix possible NPE"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-20 21:13:18 +00:00
committed by Android (Google) Code Review
parent 291672cc4a ab61a5af0b
commit 3f8c9e4cd7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/browse/MediaBrowser.java
View File

@@ -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);