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

Commit 0d194c5e authored by RoboErik's avatar RoboErik
Browse files

Post MediaSessionManager callbacks to the caller's thread 

We were just sending them from the binder thread. This makes them
post to the thread that registered the listener.

Change-Id: I27c155099da32f3bc8be6e3851272f0463df498b
parent 14690b0a

media/java/android/media/RemoteController.java

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ import java.util.List; 
        final ComponentName listenerComponent = new ComponentName(mContext,

                mOnClientUpdateListener.getClass());

        mSessionManager.addActiveSessionsListener(mSessionListener, listenerComponent,

                UserHandle.myUserId());

                UserHandle.myUserId(), null);

        mSessionListener.onActiveSessionsChanged(mSessionManager

                .getActiveSessions(listenerComponent));

        if (DEBUG) {

media/java/android/media/session/MediaSessionManager.java

+34 −13
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.Context; 
import android.media.AudioManager;

import android.media.IRemoteVolumeController;

import android.media.session.ISessionManager;

import android.os.Handler;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.ServiceManager;
@@ -37,11 +38,11 @@ import java.util.List; 


/**

 * Provides support for interacting with {@link MediaSession media sessions}

 * that applications have published to express their ongoing media playback state.

 * that applications have published to express their ongoing media playback

 * state.

 * <p>

 * Use <code>Context.getSystemService(Context.MEDIA_SESSION_SERVICE)</code> to

 * get an instance of this class.

 * <p>

 *

 * @see MediaSession

 * @see MediaController
@@ -133,15 +134,17 @@ public final class MediaSessionManager { 
     * the calling app. You may also retrieve this list if your app is an

     * enabled notification listener using the

     * {@link NotificationListenerService} APIs, in which case you must pass the

     * {@link ComponentName} of your enabled listener.

     * {@link ComponentName} of your enabled listener. Updates will be posted to

     * the thread that registered the listener.

     *

     * @param sessionListener The listener to add.

     * @param notificationListener The enabled notification listener component.

     *            May be null.

     */

    public void addActiveSessionsListener(SessionListener sessionListener,

            ComponentName notificationListener) {

        addActiveSessionsListener(sessionListener, notificationListener, UserHandle.myUserId());

    public void addActiveSessionsListener(@NonNull SessionListener sessionListener,

            @Nullable ComponentName notificationListener) {

        addActiveSessionsListener(sessionListener, notificationListener, UserHandle.myUserId(),

                null);

    }



    /**
@@ -157,13 +160,18 @@ public final class MediaSessionManager { 
     * @param notificationListener The enabled notification listener component.

     *            May be null.

     * @param userId The userId to listen for changes on.

     * @param handler The handler to post updates on.

     * @hide

     */

    public void addActiveSessionsListener(@NonNull SessionListener sessionListener,

            @Nullable ComponentName notificationListener, int userId) {

            @Nullable ComponentName notificationListener, int userId, @Nullable Handler handler) {

        if (sessionListener == null) {

            throw new IllegalArgumentException("listener may not be null");

        }

        if (handler == null) {

            handler = new Handler();

        }

        sessionListener.setHandler(handler);

        try {

            mService.addSessionsListener(sessionListener.mStub, notificationListener, userId);

        } catch (RemoteException e) {
@@ -253,6 +261,7 @@ public final class MediaSessionManager { 
     */

    public static abstract class SessionListener {

        private final Context mContext;

        private Handler mHandler;



        public SessionListener(Context context) {

            mContext = context;
@@ -269,16 +278,28 @@ public final class MediaSessionManager { 
        public abstract void onActiveSessionsChanged(

                @Nullable List<MediaController> controllers);



        private final void setHandler(Handler handler) {

            mHandler = handler;

        }



        private final IActiveSessionsListener.Stub mStub = new IActiveSessionsListener.Stub() {

            @Override

            public void onActiveSessionsChanged(List<MediaSession.Token> tokens) {

                ArrayList<MediaController> controllers = new ArrayList<MediaController>();

            public void onActiveSessionsChanged(final List<MediaSession.Token> tokens) {

                if (mHandler != null) {

                    mHandler.post(new Runnable() {

                        @Override

                        public void run() {

                            ArrayList<MediaController> controllers

                                    = new ArrayList<MediaController>();

                            int size = tokens.size();

                            for (int i = 0; i < size; i++) {

                                controllers.add(new MediaController(mContext, tokens.get(i)));

                            }

                            SessionListener.this.onActiveSessionsChanged(controllers);

                        }

                    });

                }

            }

        };

    }

}