commit | eae08c63d6d13db518731d68e888d26a8c055544 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jan 05 19:33:40 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jan 05 19:33:41 2017 +0000 |
tree | a7f8905a944b5081b6ce3d45595f8567c718c341 | |
parent | 9b07983005689872240dee2084dec3520f95eb5a [diff] | |
parent | 9623e68d8afb0131287f8e349590c96e88d29e69 [diff] |
Merge "MediaBrowserCompat: Make getItem work properly" into nyc-support-25.1-dev
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); } }