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

Commit 8f073a41 authored by Hyundo Moon's avatar Hyundo Moon Committed by android-build-merger
Browse files

Merge "MediaSession2: Make SessionCallback.onDisconnected be called" into pi-dev 

am: b34fe171

Change-Id: I868935caeff5178367e80ffa142ecc438337ac97
parents dd17c17c b34fe171

packages/MediaComponents/src/com/android/media/MediaSession2Stub.java

+11 −3
Original line number Diff line number Diff line
@@ -318,13 +318,21 @@ public class MediaSession2Stub extends IMediaSession2.Stub { 


    @Override

    public void release(final IMediaSession2Callback caller) throws RemoteException {

        ControllerInfo controller;

        synchronized (mLock) {

            ControllerInfo controllerInfo = mControllers.remove(caller.asBinder());

            controller = mControllers.remove(caller.asBinder());

            if (DEBUG) {

                Log.d(TAG, "releasing " + controllerInfo);

                Log.d(TAG, "releasing " + controller);

            }

            mSubscriptions.remove(controllerInfo);

            mSubscriptions.remove(controller);

        }

        final MediaSession2Impl session = getSession();

        if (session == null || controller == null) {

            return;

        }

        session.getCallbackExecutor().execute(() -> {

            session.getCallback().onDisconnected(session.getInstance(), controller);

        });

    }



    @Override