From 894da67efa83a5f21ca2176ff678ec8c0b562e3d Mon Sep 17 00:00:00 2001 From: Henry Fang Date: Wed, 18 Mar 2020 16:19:29 -0700 Subject: [PATCH] Fix TODO in tuner.java bug: 150868872 Test: Manual Change-Id: I1ed920ce23280f3780448894a3fb26153127a754 --- media/java/android/media/tv/tuner/Tuner.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index d24d75260395a..3954abc7e44d4 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -280,7 +280,9 @@ public class Tuner implements AutoCloseable { */ @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void shareFrontendFromTuner(@NonNull Tuner tuner) { - // TODO: implementation. + mTunerResourceManager.shareFrontend(mClientId, tuner.mClientId); + mFrontendHandle = tuner.mFrontendHandle; + nativeOpenFrontendByHandle(mFrontendHandle); } /** @@ -296,7 +298,7 @@ public class Tuner implements AutoCloseable { */ @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void updateResourcePriority(int priority, int niceValue) { - // TODO: implementation. + mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue); } private long mNativeContext; // used by native jMediaTuner @@ -307,7 +309,14 @@ public class Tuner implements AutoCloseable { @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) @Override public void close() { - // TODO: implementation. + if (mFrontendHandle != null) { + mTunerResourceManager.releaseFrontend(mFrontendHandle); + mFrontendHandle = null; + } + if (mLnb != null) { + mTunerResourceManager.releaseLnb(mLnbHandle); + mLnb = null; + } } /** @@ -827,7 +836,6 @@ public class Tuner implements AutoCloseable { Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(cb, "LnbCallback must not be null"); checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB); - // TODO: update JNI code for LNB handle, return nativeOpenLnbByHandle(mLnbHandle); }