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

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

Merge "Release resource before send MSG_RESOURCE_LOST message to TIS" am: eb709b6d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6f7ab757dcbd7c7d117e8a28b3414fc5554399e9
parents def12823 eb709b6d

media/java/android/media/tv/tuner/Tuner.java

+8 −2
Original line number Diff line number Diff line
@@ -362,6 +362,11 @@ public class Tuner implements AutoCloseable { 
     */

    @Override

    public void close() {

        releaseAll();

        TunerUtils.throwExceptionForResult(nativeClose(), "failed to close tuner");

    }



    private void releaseAll() {

        if (mFrontendHandle != null) {

            int res = nativeCloseFrontend(mFrontendHandle);

            if (res != Tuner.RESULT_SUCCESS) {
@@ -396,9 +401,9 @@ public class Tuner implements AutoCloseable { 
                TunerUtils.throwExceptionForResult(res, "failed to close demux");

            }

            mTunerResourceManager.releaseDemux(mDemuxHandle, mClientId);

            mFrontendHandle = null;

            mDemuxHandle = null;

        }

        TunerUtils.throwExceptionForResult(nativeClose(), "failed to close tuner");



    }



    /**
@@ -495,6 +500,7 @@ public class Tuner implements AutoCloseable { 
                    break;

                }

                case MSG_RESOURCE_LOST: {

                    releaseAll();

                    if (mOnResourceLostListener != null

                                && mOnResourceLostListenerExecutor != null) {

                        mOnResourceLostListenerExecutor.execute(