diff options
| -rwxr-xr-x | api/system-current.txt | 9 | ||||
| -rw-r--r-- | media/java/android/media/tv/tuner/Descrambler.java | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 7f17beb52371..41533b7cd19d 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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[]); diff --git a/media/java/android/media/tv/tuner/Descrambler.java b/media/java/android/media/tv/tuner/Descrambler.java index 37f8f5c81f33..f46d3ce03cb0 100644 --- a/media/java/android/media/tv/tuner/Descrambler.java +++ b/media/java/android/media/tv/tuner/Descrambler.java @@ -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() {} /** |