| commit | 62bd6fc1ad1fbbc474bc3575d763aa01c83ccd84 | [log] [tgz] |
|---|---|---|
| author | Sungsoo <sungsoo@google.com> | Thu Jan 05 19:37:58 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 05 19:37:58 2017 +0000 |
| tree | 70f535bbcaa1fe619b2c26ab871b1d69a4d13021 | |
| parent | 6419a5cbc4f16157951724cf3d3e5de2b44a74f3 [diff] | |
| parent | 9623e68d8afb0131287f8e349590c96e88d29e69 [diff] |
MediaBrowserCompat: Make getItem work properly am: 9623e68d8a Change-Id: I9d0131d3464adf387b88f65efa195ca38cc06e0c
diff --git a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java index affb130..4035e63 100644 --- a/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java +++ b/media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java
@@ -71,6 +71,7 @@ mResultObj.sendResult(parcelListToItemList((List<Parcel>)result)); } else if (result instanceof Parcel) { Parcel parcel = (Parcel) result; + parcel.setDataPosition(0); mResultObj.sendResult(MediaBrowser.MediaItem.CREATOR.createFromParcel(parcel)); parcel.recycle(); } else {
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java index a9fc7e8..de5047b 100644 --- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java +++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -403,6 +403,11 @@ @Override public Bundle getBrowserRootHints() { + // If EXTRA_MESSENGER_BINDER is used, mCurConnection is not null. + if (mCurConnection != null) { + return mCurConnection.rootHints == null ? null + : new Bundle(mCurConnection.rootHints); + } return MediaBrowserServiceCompatApi24.getBrowserRootHints(mServiceObj); } }