diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:25:03 -0500 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2017-04-05 07:25:03 -0500 |
| commit | 5a832ea51874a2381564c5329bf47db518d47ff7 (patch) | |
| tree | 1a4ee240e75a30745466481244da51e415704136 /media-compat | |
| parent | 0285afecf474df8254879e2c35043d4174713d69 (diff) | |
| parent | 9201a902d80346b09042da74bf3639f61622e285 (diff) | |
| download | android_frameworks_support-cm-14.1.tar.gz android_frameworks_support-cm-14.1.tar.bz2 android_frameworks_support-cm-14.1.zip | |
Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2cm-14.1
Android 7.1.2 Release 2 (N2G47E)
# gpg: Signature made Mon 03 Apr 2017 01:41:48 AM CDT
# gpg: using DSA key E8AD3F819AB10E78
# gpg: Can't check signature: No public key
Diffstat (limited to 'media-compat')
| -rw-r--r-- | media-compat/java/android/support/v4/media/MediaBrowserCompat.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java index 1fe0da9d71..79f61c31a5 100644 --- a/media-compat/java/android/support/v4/media/MediaBrowserCompat.java +++ b/media-compat/java/android/support/v4/media/MediaBrowserCompat.java @@ -1784,7 +1784,9 @@ public final class MediaBrowserCompat { @Override protected void onReceiveResult(int resultCode, Bundle resultData) { - resultData.setClassLoader(MediaBrowserCompat.class.getClassLoader()); + if (resultData != null) { + resultData.setClassLoader(MediaBrowserCompat.class.getClassLoader()); + } if (resultCode != 0 || resultData == null || !resultData.containsKey(MediaBrowserServiceCompat.KEY_MEDIA_ITEM)) { mCallback.onError(mMediaId); |