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

Commit f8e970a9 authored by Jaewan Kim's avatar Jaewan Kim
Browse files

MediaSession2: Fix controller is disconnected immediatly after connected 

This is regression introduced by my previous commit
45d94a48 MediaSession2Service: Initial commit

Test: Run CTS
Change-Id: Id1490e1897e502c2a6008e5ed72158d4d5cf9685
parent 842af1ec

media/java/android/media/MediaSession2.java

+10 −6
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ public class MediaSession2 implements AutoCloseable { 
        final ControllerInfo controllerInfo = new ControllerInfo(remoteUserInfo,

                mSessionManager.isTrustedForMediaControl(remoteUserInfo), controller);

        mCallbackExecutor.execute(() -> {

            boolean accept = false;

            boolean connected = false;

            try {

                if (isClosed()) {

                    return;
@@ -249,8 +249,7 @@ public class MediaSession2 implements AutoCloseable { 
                // Don't reject connection for the request from trusted app.

                // Otherwise server will fail to retrieve session's information to dispatch

                // media keys to.

                accept = controllerInfo.mAllowedCommands != null || controllerInfo.isTrusted();

                if (!accept) {

                if (controllerInfo.mAllowedCommands == null && !controllerInfo.isTrusted()) {

                    return;

                }

                if (controllerInfo.mAllowedCommands == null) {
@@ -283,14 +282,19 @@ public class MediaSession2 implements AutoCloseable { 
                    return;

                }

                controllerInfo.notifyConnected(connectionResult);

                connected = true;

            } finally {

                if (!accept) {

                if (!connected) {

                    if (DEBUG) {

                        Log.d(TAG, "Rejecting connection, controllerInfo=" + controllerInfo);

                        Log.d(TAG, "Rejecting connection or notifying that session is closed"

                                + ", controllerInfo=" + controllerInfo);

                    }

                    synchronized (mLock) {

                        mConnectedControllers.remove(controller);

                    }

                    controllerInfo.notifyDisconnected();

                }

            }

        });

    }