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

Commit 55a7e601 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

media: protect around set_callback_stall aconfig flag access 

Related-Bug: 325389296
Bug: 331666510
Test: builds
Flag: android.media.codec.set_callback_stall
Change-Id: I6eff1b65fadc51ef3265fbea0f24804edf644b09
parent debe12db

media/java/android/media/MediaCodec.java

+4 −2
Original line number Diff line number Diff line
@@ -5263,6 +5263,8 @@ final public class MediaCodec { 
     *           main thread.)

     */

    public void setCallback(@Nullable /* MediaCodec. */ Callback cb, @Nullable Handler handler) {

        boolean setCallbackStallFlag =

            GetFlag(() -> android.media.codec.Flags.setCallbackStall());

        if (cb != null) {

            synchronized (mListenerLock) {

                EventHandler newHandler = getEventHandlerOn(handler, mCallbackHandler);
@@ -5270,7 +5272,7 @@ final public class MediaCodec { 
                // even if we were to extend this to be callable dynamically, it must

                // be called when codec is flushed, so no messages are pending.

                if (newHandler != mCallbackHandler) {

                    if (android.media.codec.Flags.setCallbackStall()) {

                    if (setCallbackStallFlag) {

                        logAndRun(

                                "[new handler] removeMessages(SET_CALLBACK)",

                                () -> {
@@ -5289,7 +5291,7 @@ final public class MediaCodec { 
                }

            }

        } else if (mCallbackHandler != null) {

            if (android.media.codec.Flags.setCallbackStall()) {

            if (setCallbackStallFlag) {

                logAndRun(

                        "[null handler] removeMessages(SET_CALLBACK)",

                        () -> {