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

Merge "Add some invalid constants for Tuner"

Browse Source
This commit is contained in:
Amy Zhang
2020-11-10 18:14:22 +00:00
committed by Android (Google) Code Review
parent 33576666f2 df135cdd22
commit c1bae49aff
5 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -5102,7 +5102,9 @@ package android.media.tv.tuner {
field public static final int INVALID_FILTER_ID = -1; // 0xffffffff
field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL
field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff
field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff
field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff
field @NonNull public static final byte[] INVALID_KEYTOKEN;
field public static final int INVALID_LTS_ID = -1; // 0xffffffff
field public static final int INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM = -1; // 0xffffffff
field public static final int INVALID_STREAM_ID = 65535; // 0xffff

2
core/api/system-current.txt
View File

@@ -5042,7 +5042,9 @@ package android.media.tv.tuner {
field public static final int INVALID_FILTER_ID = -1; // 0xffffffff
field public static final long INVALID_FILTER_ID_64BIT = -1L; // 0xffffffffffffffffL
field public static final int INVALID_FIRST_MACROBLOCK_IN_SLICE = -1; // 0xffffffff
field public static final int INVALID_FRONTEND_ID = -1; // 0xffffffff
field public static final int INVALID_FRONTEND_SETTING_FREQUENCY = -1; // 0xffffffff
field @NonNull public static final byte[] INVALID_KEYTOKEN;
field public static final int INVALID_LTS_ID = -1; // 0xffffffff
field public static final int INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM = -1; // 0xffffffff
field public static final int INVALID_STREAM_ID = 65535; // 0xffff

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

@@ -111,10 +111,13 @@ public class Descrambler implements AutoCloseable {
/**
* Set a key token to link descrambler to a key slot
*
* A descrambler instance can have only one key slot to link, but a key slot can hold a few
* <p>A descrambler instance can have only one key slot to link, but a key slot can hold a few
* keys for different purposes.
*
* @param keyToken the token to be used to link the key slot.
* @param keyToken the token to be used to link the key slot. Use {@link Tuner.INVALID_KEYTOKEN}
* to remove the to remove the current key from descrambler. If the current keyToken
* comes from MediaCas session, use {@link Tuner.INVALID_KEYTOKEN} to remove current key
* before close MediaCas session.
* @return result status of the operation.
*/
@Result

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

@@ -152,6 +152,27 @@ public class Tuner implements AutoCloseable {
*/
public static final int INVALID_FRONTEND_SETTING_FREQUENCY =
android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_SETTING_FREQUENCY;
/**
* Invalid frontend id.
*/
public static final int INVALID_FRONTEND_ID =
android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_FRONTEND_ID;
/**
* Invalid LNB id.
*
* @hide
*/
public static final int INVALID_LNB_ID =
android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_LNB_ID;
/**
* Invalid key token. It is used to remove the current key from descrambler.
*
* <p>If the current keyToken comes from a MediaCas session, App is recommended to
* to use this constant to remove current key before closing MediaCas session.
*/
@NonNull
public static final byte[] INVALID_KEYTOKEN =
{android.hardware.tv.tuner.V1_1.Constants.Constant.INVALID_KEYTOKEN};
/** @hide */
@IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_AUTO, SCAN_TYPE_BLIND})

3
media/java/android/media/tv/tuner/frontend/FrontendInfo.java
View File

@@ -53,6 +53,9 @@ public class FrontendInfo {
/**
* Gets frontend ID.
*
* @return the frontend ID or {@link android.media.tv.tuner.Tuner.INVALID_FRONTEND_ID}
* if invalid
*/
public int getId() {
return mId;