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

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

Merge "Add patch for tvview callback run in single thread." into main am: d77f07b2 

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



Change-Id: I440d2354f160e0dd4bede19b372599e3e6a43e40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3490767f d77f07b2

media/java/android/media/tv/TvView.java

+12 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class TvView extends ViewGroup { 
    private static final Object sMainTvViewLock = new Object();

    private static WeakReference<TvView> sMainTvView = NULL_TV_VIEW;



    private final Handler mHandler = new Handler();

    private Handler mHandler = new Handler();

    private Session mSession;

    private SurfaceView mSurfaceView;

    private Surface mSurface;
@@ -207,6 +207,17 @@ public class TvView extends ViewGroup { 
        mCallback = callback;

    }



    /**

     * Sets the handler to be invoked when an event is dispatched to this TvView.

     * If handler is not set by this function, TvView will use its default handler.

     *

     * @param handler The handler to handle events.

     * @hide

     */

    public void setHandler(@NonNull Handler handler) {

        mHandler = handler;

    }



    /** @hide */

    public Session getInputSession() {

        return mSession;