commit 9623e68d8afb0131287f8e349590c96e88d29e69
author Sungsoo <sungsoo@google.com> Thu Jan 05 14:05:51 2017 +0900
committer Sungsoo <sungsoo@google.com> Thu Jan 05 14:08:26 2017 +0900
tree 165088f62331852267948f75146b52c5607b32ff
parent b07a54e4f56e2f681b76aa36cc8cc5a746da4ea0

MediaBrowserCompat: Make getItem work properly

We disabled MediaBrowserCompatTest.testGetItem because of the test
failure.

Bug: 34069123
Change-Id: I2204ebac654e55a00ad230492f8812e34f6619a3

media-compat/api21/android/support/v4/media/MediaBrowserServiceCompatApi21.java

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 {

media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java

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