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

Commit c2f557a4 authored by Hyundo Moon's avatar Hyundo Moon Committed by Jaewan Kim
Browse files

MediaBrowserService: Create getCurrentBrowserInfo() 

Bug: 65739365
Test: Ran MediaBrowserServiceTest
Change-Id: I629d74bcf9a08a2271463fecbacc2d998dce4387
parent b1e344ea

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -39138,6 +39138,7 @@ package android.service.media { 
    ctor public MediaBrowserService();

    method public void dump(java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);

    method public final android.os.Bundle getBrowserRootHints();

    method public final android.media.session.MediaSessionManager.RemoteUserInfo getCurrentBrowserInfo();

    method public android.media.session.MediaSession.Token getSessionToken();

    method public void notifyChildrenChanged(java.lang.String);

    method public void notifyChildrenChanged(java.lang.String, android.os.Bundle);

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

+29 −4
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ import android.media.session.MediaSession; 
import android.os.Binder;

import android.os.Bundle;

import android.os.Handler;

import android.media.session.MediaSessionManager;

import android.media.session.MediaSessionManager.RemoteUserInfo;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ResultReceiver;
@@ -112,6 +114,8 @@ public abstract class MediaBrowserService extends Service { 
     */

    private class ConnectionRecord implements IBinder.DeathRecipient {

        String pkg;

        int uid;

        int pid;

        Bundle rootHints;

        IMediaBrowserServiceCallbacks callbacks;

        BrowserRoot root;
@@ -199,6 +203,7 @@ public abstract class MediaBrowserService extends Service { 
        public void connect(final String pkg, final Bundle rootHints,

                final IMediaBrowserServiceCallbacks callbacks) {



            final int pid = Binder.getCallingPid();

            final int uid = Binder.getCallingUid();

            if (!isValidPackage(pkg, uid)) {

                throw new IllegalArgumentException("Package/uid mismatch: uid=" + uid
@@ -215,9 +220,14 @@ public abstract class MediaBrowserService extends Service { 


                        final ConnectionRecord connection = new ConnectionRecord();

                        connection.pkg = pkg;

                        connection.pid = pid;

                        connection.uid = uid;

                        connection.rootHints = rootHints;

                        connection.callbacks = callbacks;



                        mCurConnection = connection;

                        connection.root = MediaBrowserService.this.onGetRoot(pkg, uid, rootHints);

                        mCurConnection = null;



                        // If they didn't return something, don't allow this client.

                        if (connection.root == null) {
@@ -505,20 +515,35 @@ public abstract class MediaBrowserService extends Service { 
     * media browser service when connecting and retrieving the root id for browsing, or null if

     * none. The contents of this bundle may affect the information returned when browsing.

     *

     * @throws IllegalStateException If this method is called outside of {@link #onLoadChildren} or

     *             {@link #onLoadItem}.

     * @throws IllegalStateException If this method is called outside of {@link #onGetRoot} or

     *             {@link #onLoadChildren} or {@link #onLoadItem}.

     * @see MediaBrowserService.BrowserRoot#EXTRA_RECENT

     * @see MediaBrowserService.BrowserRoot#EXTRA_OFFLINE

     * @see MediaBrowserService.BrowserRoot#EXTRA_SUGGESTED

     */

    public final Bundle getBrowserRootHints() {

        if (mCurConnection == null) {

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

                    + " onLoadItem methods");

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

                    + " onLoadChildren or onLoadItem methods");

        }

        return mCurConnection.rootHints == null ? null : new Bundle(mCurConnection.rootHints);

    }



    /**

     * Gets the browser information who sent the current request.

     *

     * @throws IllegalStateException If this method is called outside of {@link #onGetRoot} or

     *             {@link #onLoadChildren} or {@link #onLoadItem}.

     * @see MediaSessionManager#isTrustedForMediaControl(RemoteUserInfo)

     */

    public final RemoteUserInfo getCurrentBrowserInfo() {

        if (mCurConnection == null) {

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

                    + " onLoadChildren or onLoadItem methods");

        }

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

    }



    /**

     * Notifies all connected media browsers that the children of

     * the specified parent id have changed in some way.