Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b2b70e789fd7e2247d246d1c4718d971e791cdc
This commit is contained in:
Treehugger Robot
2020-12-30 12:22:57 +00:00
committed by Automerger Merge Worker
parent 4b7054b9c0 acb16468cb
commit 1f07b60a75
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/tv/tuner/Tuner.java
View File

@@ -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(