commit 0349869c064d3d0a83359b49f3ce9c35a0fa837a
author Jaewan Kim <jaewan@google.com> Thu May 24 12:39:29 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 24 12:39:29 2018 -0700
tree d5b0e24901070f7b9975ed57c7868f2637262b7e
parent 1fa3b11dfe50ded84d3cebe933f067d278f77a8e
parent 0e7a307e1440aa6edde687e44e21d3b9f968e325

Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev
am: 0e7a307e14

Change-Id: I455466d79d0c1b534d87b33cdb787194422a51bf

media/java/android/service/media/MediaBrowserService.java

diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java
index 6d1bd45..ca7ab7e 100644
--- a/media/java/android/service/media/MediaBrowserService.java
+++ b/media/java/android/service/media/MediaBrowserService.java
@@ -541,7 +541,8 @@
             throw new IllegalStateException("This should be called inside of onGetRoot or"
                     + " onLoadChildren or onLoadItem methods");
         }
-        return new RemoteUserInfo(mCurConnection.pkg, mCurConnection.pid, mCurConnection.uid);
+        return new RemoteUserInfo(mCurConnection.pkg, mCurConnection.pid, mCurConnection.uid,
+                mCurConnection.callbacks.asBinder());
     }
 
     /**