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

Commit fd3fdfdf authored by Insun Kang's avatar Insun Kang
Browse files

Release MediaSession when VideoView2 is detached from window. 

Test: build
Change-Id: I36baae35cc8196e3fa2fc9f9bdda4219ffaf863d
parent 9683b889

core/java/android/widget/MediaControlView2.java

+19 −0
Original line number Diff line number Diff line
@@ -157,6 +157,15 @@ public class MediaControlView2 extends FrameLayout { 
        mProvider.hideSubtitle_impl();

    }



    @Override

    protected void onAttachedToWindow() {

        mProvider.onAttachedToWindow_impl();

    }

    @Override

    protected void onDetachedFromWindow() {

        mProvider.onDetachedFromWindow_impl();

    }



    @Override

    public CharSequence getAccessibilityClassName() {

        return mProvider.getAccessibilityClassName_impl();
@@ -193,6 +202,16 @@ public class MediaControlView2 extends FrameLayout { 
    }



    private class SuperProvider implements ViewProvider {

        @Override

        public void onAttachedToWindow_impl() {

            MediaControlView2.super.onAttachedToWindow();

        }



        @Override

        public void onDetachedFromWindow_impl() {

            MediaControlView2.super.onDetachedFromWindow();

        }



        @Override

        public CharSequence getAccessibilityClassName_impl() {

            return MediaControlView2.super.getAccessibilityClassName();

core/java/android/widget/VideoView2.java

+20 −0
Original line number Diff line number Diff line
@@ -368,6 +368,16 @@ public class VideoView2 extends FrameLayout { 
        void onInfo(int what, int extra);

    }



    @Override

    protected void onAttachedToWindow() {

        mProvider.onAttachedToWindow_impl();

    }



    @Override

    protected void onDetachedFromWindow() {

        mProvider.onDetachedFromWindow_impl();

    }



    @Override

    public CharSequence getAccessibilityClassName() {

        return mProvider.getAccessibilityClassName_impl();
@@ -404,6 +414,16 @@ public class VideoView2 extends FrameLayout { 
    }



    private class SuperProvider implements ViewProvider {

        @Override

        public void onAttachedToWindow_impl() {

            VideoView2.super.onAttachedToWindow();

        }



        @Override

        public void onDetachedFromWindow_impl() {

            VideoView2.super.onDetachedFromWindow();

        }



        @Override

        public CharSequence getAccessibilityClassName_impl() {

            return VideoView2.super.getAccessibilityClassName();

media/java/android/media/update/ViewProvider.java

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ import android.view.MotionEvent; 
// TODO @SystemApi

public interface ViewProvider {

    // TODO Add more (all?) methods from View

    void onAttachedToWindow_impl();

    void onDetachedFromWindow_impl();

    CharSequence getAccessibilityClassName_impl();

    boolean onTouchEvent_impl(MotionEvent ev);

    boolean onTrackballEvent_impl(MotionEvent ev);