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

Commit db25f3d3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media: protect around set_callback_stall aconfig flag access" into main am: de189371 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3191670



Change-Id: I164cac78a8629798f7eb6da099cd524d372a9289
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5240818b de189371

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)",

                        () -> {