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

Merge "Make Descrambler @SystemApi"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-21 03:13:16 +00:00
committed by Android (Google) Code Review
parent 2f6e9b48cf 376658ebcc
commit 5cc8e20464
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/system-current.txt
View File

@@ -4674,6 +4674,15 @@ package android.media.tv.tuner {
method public int getVideoFilterCount();
}
public class Descrambler implements java.lang.AutoCloseable {
method public int addPid(int, int, @Nullable android.media.tv.tuner.filter.Filter);
method public void close();
method public int removePid(int, int, @Nullable android.media.tv.tuner.filter.Filter);
method public int setKeyToken(@Nullable byte[]);
field public static final int PID_TYPE_MMTP = 2; // 0x2
field public static final int PID_TYPE_T = 1; // 0x1
}
public class Lnb implements java.lang.AutoCloseable {
method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public void close();
method @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public int sendDiseqcMessage(@NonNull byte[]);

3
media/java/android/media/tv/tuner/Descrambler.java
View File

@@ -18,6 +18,7 @@ package android.media.tv.tuner;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.media.tv.tuner.filter.Filter;
import java.lang.annotation.Retention;
@@ -32,6 +33,7 @@ import java.lang.annotation.RetentionPolicy;
*
* @hide
*/
@SystemApi
public class Descrambler implements AutoCloseable {
/** @hide */
@IntDef(prefix = "PID_TYPE_", value = {PID_TYPE_T, PID_TYPE_MMTP})
@@ -55,6 +57,7 @@ public class Descrambler implements AutoCloseable {
private native int nativeSetKeyToken(byte[] keyToken);
private native int nativeClose();
// Called by JNI code
private Descrambler() {}
/**