commit e75dca3feec77fac58f1fa5f7a9b1195b4898368
author Lajos Molnar <lajos@google.com> Wed Jan 23 16:33:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 23 16:33:24 2019 +0000
tree 27efc16db93cd28dd581b145cdc1d1a5f82ef066
parent bf5b9565bc82ad6a246204668e3229d9b40406c3
parent 9c17d8d36c0bcc5577dc80ec536c2db379d622e7

Merge "stagefright: add c2 gsm and mpeg2 decoders to codec xmls"

packages/MediaComponents/apex/java/android/media/session/MediaSession.java

diff --git a/packages/MediaComponents/apex/java/android/media/session/MediaSession.java b/packages/MediaComponents/apex/java/android/media/session/MediaSession.java
index 73e16a6..3cbeff9 100644
--- a/packages/MediaComponents/apex/java/android/media/session/MediaSession.java
+++ b/packages/MediaComponents/apex/java/android/media/session/MediaSession.java
@@ -1077,8 +1077,7 @@
 
         private static RemoteUserInfo createRemoteUserInfo(String packageName, int pid, int uid,
                 ISessionControllerCallback caller) {
-            return new RemoteUserInfo(packageName, pid, uid,
-                    caller != null ? caller.asBinder() : null);
+            return new RemoteUserInfo(packageName, pid, uid);
         }
 
         @Override

packages/MediaComponents/apex/java/android/service/media/MediaBrowserService.java

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