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

Merge "Fix TODO in tuner.java" into rvc-dev

Browse Source
This commit is contained in:
Henry Fang
2020-03-19 00:45:05 +00:00
committed by Android (Google) Code Review
parent 6051bff9da 894da67efa
commit dd394239bb
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -281,7 +281,9 @@ public class Tuner implements AutoCloseable {
* @param tuner the Tuner instance to share frontend resource with. * @param tuner the Tuner instance to share frontend resource with.
*/ */
public void shareFrontendFromTuner(@NonNull Tuner 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 {
* @param niceValue the nice value. * @param niceValue the nice value.
*/ */
public void updateResourcePriority(int priority, int niceValue) { public void updateResourcePriority(int priority, int niceValue) {
// TODO: implementation. mTunerResourceManager.updateClientPriority(mClientId, priority, niceValue);
} }
private long mNativeContext; // used by native jMediaTuner private long mNativeContext; // used by native jMediaTuner
@@ -306,7 +308,14 @@ public class Tuner implements AutoCloseable {
*/ */
@Override @Override
public void close() { public void close() {
// TODO: implementation. if (mFrontendHandle != null) {
mTunerResourceManager.releaseFrontend(mFrontendHandle);
mFrontendHandle = null;
}
if (mLnb != null) {
mTunerResourceManager.releaseLnb(mLnbHandle);
mLnb = null;
}
} }
/** /**
@@ -806,7 +815,6 @@ public class Tuner implements AutoCloseable {
Objects.requireNonNull(executor, "executor must not be null"); Objects.requireNonNull(executor, "executor must not be null");
Objects.requireNonNull(cb, "LnbCallback must not be null"); Objects.requireNonNull(cb, "LnbCallback must not be null");
checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB); checkResource(TunerResourceManager.TUNER_RESOURCE_TYPE_LNB);
// TODO: update JNI code for LNB handle,
return nativeOpenLnbByHandle(mLnbHandle); return nativeOpenLnbByHandle(mLnbHandle);
} }