From 376658ebcc266dbd4178ed3d51031d4b7b9a7c70 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Sun, 12 Jan 2020 16:57:43 -0800
Subject: [PATCH] Make Descrambler @SystemApi

Test: make;
Bug: 139308734
Change-Id: I4c15348bb61ce78937210726b72842705b2db472
---
 api/system-current.txt                             | 9 +++++++++
 media/java/android/media/tv/tuner/Descrambler.java | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/api/system-current.txt b/api/system-current.txt
index 06882eb280b6e..3b97c13ba536e 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4665,6 +4665,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 37f8f5c81f339..f46d3ce03cb0a 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() {}
 
     /**