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

Commit 0a5b7784 authored by Dongwon Kang's avatar Dongwon Kang Committed by Android Git Automerger
Browse files

am c523b768: Merge "Make TvView keep the volume value and set later once the... 

am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev

* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
  Make TvView keep the volume value and set later once the connecation is made.
parents aa00ae0a ba4b4322

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

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public class TvView extends SurfaceView { 
    private MySessionCallback mSessionCallback;

    private TvInputListener mListener;

    private OnUnhandledInputEventListener mOnUnhandledInputEventListener;

    private boolean mHasStreamVolume;

    private float mStreamVolume;



    private final SurfaceHolder.Callback mSurfaceHolderCallback = new SurfaceHolder.Callback() {

        @Override
@@ -143,7 +145,10 @@ public class TvView extends SurfaceView { 
     */

    public void setStreamVolume(float volume) {

        if (DEBUG) Log.d(TAG, "setStreamVolume(" + volume + ")");

        mHasStreamVolume = true;

        mStreamVolume = volume;

        if (mSession == null) {

            // Volume will be set once the connection has been made.

            return;

        }

        mSession.setStreamVolume(volume);
@@ -476,6 +481,9 @@ public class TvView extends SurfaceView { 
                }

                createSessionOverlayView();

                mSession.tune(mChannelUri);

                if (mHasStreamVolume) {

                    mSession.setStreamVolume(mStreamVolume);

                }

            } else {

                if (mListener != null) {

                    mListener.onError(mInputId, ERROR_BUSY);