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

Commit bdcb3080 authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

MediaSession: Rename mCallbackHandler to mCallback 

Support library uses reflection to the variable, mCallback, of
MediaSession. In order not to break the existing support lib
behavior on P devices, we need to keep the name.

Bug: 72979099
Test: version-compat-tests on P device
Change-Id: I5fd6c786d6a988777b94a3eb4f23d885202daa2a
parent d0b86597

media/java/android/media/session/MediaSession.java

+9 −8
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ public final class MediaSession { 
    private final ISession mBinder;

    private final CallbackStub mCbStub;



    private CallbackMessageHandler mCallbackHandler;

    // Do not change the name of mCallback. Support lib accesses this by using reflection.

    private CallbackMessageHandler mCallback;

    private VolumeProvider mVolumeProvider;

    private PlaybackState mPlaybackState;
@@ -194,13 +195,13 @@ public final class MediaSession { 
     */

    public void setCallback(@Nullable Callback callback, @Nullable Handler handler) {

        synchronized (mLock) {

            if (mCallbackHandler != null) {

            if (mCallback != null) {

                // We're updating the callback, clear the session from the old one.

                mCallbackHandler.mCallback.mSession = null;

                mCallbackHandler.removeCallbacksAndMessages(null);

                mCallback.mCallback.mSession = null;

                mCallback.removeCallbacksAndMessages(null);

            }

            if (callback == null) {

                mCallbackHandler = null;

                mCallback = null;

                return;

            }

            if (handler == null) {
@@ -209,7 +210,7 @@ public final class MediaSession { 
            callback.mSession = this;

            CallbackMessageHandler msgHandler = new CallbackMessageHandler(handler.getLooper(),

                    callback);

            mCallbackHandler = msgHandler;

            mCallback = msgHandler;

        }

    }
@@ -634,8 +635,8 @@ public final class MediaSession { 


    private void postToCallback(int what, Object obj, Bundle extras) {

        synchronized (mLock) {

            if (mCallbackHandler != null) {

                mCallbackHandler.post(what, obj, extras);

            if (mCallback != null) {

                mCallback.post(what, obj, extras);

            }

        }

    }