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

Commit 2a96fc1f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "Fix RemoteController update in RemoteControlClient registration" into klp-dev

parents 24fe066e 320ad9fa

media/java/android/media/MediaFocusControl.java

+2 −3
Original line number Diff line number Diff line
@@ -1930,7 +1930,6 @@ public class MediaFocusControl implements OnFinished { 
        int rccId = RemoteControlClient.RCSE_ID_UNREGISTERED;

        synchronized(mAudioFocusLock) {

            synchronized(mRCStack) {

                boolean wasCurrentRcController = isCurrentRcController(mediaIntent);

                // store the new display information

                try {

                    for (int index = mRCStack.size()-1; index >= 0; index--) {
@@ -1977,9 +1976,9 @@ public class MediaFocusControl implements OnFinished { 
                    Log.e(TAG, "Wrong index accessing RC stack, lock error? ", e);

                }



                // if the eventReceiver is now at the top of the stack but wasn't before

                // if the eventReceiver is at the top of the stack

                // then check for potential refresh of the remote controls

                if (isCurrentRcController(mediaIntent) && !wasCurrentRcController) {

                if (isCurrentRcController(mediaIntent)) {

                    checkUpdateRemoteControlDisplay_syncAfRcs(RC_INFO_ALL);

                }

            }//synchronized(mRCStack)