Merge "Make Descrambler @SystemApi"

    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[]);

import android.annotation.IntDef;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.media.tv.tuner.filter.Filter;

import java.lang.annotation.Retention;

 *

 * @hide

 */

@SystemApi

public class Descrambler implements AutoCloseable {

    /** @hide */

    @IntDef(prefix = "PID_TYPE_", value = {PID_TYPE_T, PID_TYPE_MMTP})

    private native int nativeSetKeyToken(byte[] keyToken);

    private native int nativeClose();

    // Called by JNI code

    private Descrambler() {}

    /**