Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb88fcd6 authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "AML: Use 4-params consturctor of RemoteUserInfo"

parents 17e1cf21 3170810a

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -1070,12 +1070,8 @@ public final class MediaSession { 




        private static RemoteUserInfo createRemoteUserInfo(String packageName, int pid, int uid,

        private static RemoteUserInfo createRemoteUserInfo(String packageName, int pid, int uid,

                ISessionControllerCallback caller) {

                ISessionControllerCallback caller) {

            //TODO(b/119752205): Resolve hidden API usage. 4-param constructor of RemoteUserInfo

            /*

            return new RemoteUserInfo(packageName, pid, uid,

            return new RemoteUserInfo(packageName, pid, uid,

                    caller != null ? caller.asBinder() : null);

                    caller != null ? caller.asBinder() : null);

            */

            return new RemoteUserInfo(packageName, pid, uid);

        }

        }





        @Override

        @Override

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -544,12 +544,8 @@ public abstract class MediaBrowserService extends Service { 
            throw new IllegalStateException("This should be called inside of onGetRoot or"

            throw new IllegalStateException("This should be called inside of onGetRoot or"

                    + " onLoadChildren or onLoadItem methods");

                    + " onLoadChildren or onLoadItem methods");

        }

        }

        //TODO(b/119752205): Resolve hidden API usage. 4-param constructor of RemoteUserInfo

        /*

        return new RemoteUserInfo(mCurConnection.pkg, mCurConnection.pid, mCurConnection.uid,

        return new RemoteUserInfo(mCurConnection.pkg, mCurConnection.pid, mCurConnection.uid,

                mCurConnection.callbacks.asBinder());

                mCurConnection.callbacks.asBinder());

        */

        return new RemoteUserInfo(mCurConnection.pkg, mCurConnection.pid, mCurConnection.uid);

    }

    }





    /**

    /**