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

Unhide Descrambler class

Browse Source 
Test: make;
Bug: 139308734

Change-Id: I78f8fda2f83786cd46a9293949c50fc43f5cafd6
This commit is contained in:
shubang
2019-12-16 16:21:17 -08:00
parent 74c4faa398
commit 0ce6ae1560
2 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -4489,9 +4489,13 @@ package android.media.tv.tuner {
public final class Tuner implements java.lang.AutoCloseable {
ctor public Tuner(@NonNull android.content.Context);
method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public android.media.tv.tuner.Tuner.Descrambler openDescrambler();
method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int tune(@NonNull android.media.tv.tuner.FrontendSettings);
}
public class Tuner.Descrambler {
}
}
package android.metrics {

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

@@ -380,7 +380,14 @@ public final class Tuner implements AutoCloseable {
}
}
/** @hide */
/**
* This class is used to interact with descramblers.
*
* <p> Descrambler is a hardware component used to descramble data.
*
* <p> This class controls the TIS interaction with Tuner HAL.
*
*/
public class Descrambler {
private long mNativeContext;
@@ -389,19 +396,28 @@ public final class Tuner implements AutoCloseable {
private Descrambler() {}
private boolean addPid(@DemuxPidType int pidType, int pid, Filter filter) {
/** @hide */
public boolean addPid(@DemuxPidType int pidType, int pid, Filter filter) {
return nativeAddPid(pidType, pid, filter);
}
private boolean removePid(@DemuxPidType int pidType, int pid, Filter filter) {
/** @hide */
public boolean removePid(@DemuxPidType int pidType, int pid, Filter filter) {
return nativeRemovePid(pidType, pid, filter);
}
}
private Descrambler openDescrambler() {
Descrambler descrambler = nativeOpenDescrambler();
return descrambler;
/**
* Opens a Descrambler in tuner.
*
* @return a {@link Descrambler} object.
*/
@RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER)
@Nullable
public Descrambler openDescrambler() {
checkPermission();
return nativeOpenDescrambler();
}
// TODO: consider splitting Dvr to Playback and Recording