summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-02-16 08:23:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-02-16 08:23:53 +0000
commitd856f95d2fcc823b3b6ba1e98e19dad3593c155c (patch)
tree78452fd511abb092a394b4157b9ec961ec528088
parent04eebb6f76393cfc2a934786e9b1c2129f86ef47 (diff)
parent3801d6cb9840ab6031ab0484608976c65c43b7f3 (diff)
Merge "Add Invalid Filter/AVSyncID"
-rwxr-xr-xapi/system-current.txt6
-rw-r--r--media/java/android/media/tv/tuner/TunerConstants.java8
2 files changed, 12 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 5adf304ae154..a181da8dec23 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -4911,8 +4911,10 @@ package android.media.tv.tuner {
}
public final class TunerConstants {
- field public static final int INVALID_STREAM_ID = -1; // 0xffffffff
- field public static final int INVALID_TS_PID = -1; // 0xffffffff
+ field public static final int INVALID_AV_SYNC_ID = -1; // 0xffffffff
+ field public static final int INVALID_FILTER_ID = -1; // 0xffffffff
+ field public static final int INVALID_STREAM_ID = 65535; // 0xffff
+ field public static final int INVALID_TS_PID = 65535; // 0xffff
field public static final int RESULT_INVALID_ARGUMENT = 4; // 0x4
field public static final int RESULT_INVALID_STATE = 3; // 0x3
field public static final int RESULT_NOT_INITIALIZED = 2; // 0x2
diff --git a/media/java/android/media/tv/tuner/TunerConstants.java b/media/java/android/media/tv/tuner/TunerConstants.java
index f54808dbe0b0..82af658af2ca 100644
--- a/media/java/android/media/tv/tuner/TunerConstants.java
+++ b/media/java/android/media/tv/tuner/TunerConstants.java
@@ -38,6 +38,14 @@ public final class TunerConstants {
* Invalid stream ID.
*/
public static final int INVALID_STREAM_ID = Constants.Constant.INVALID_STREAM_ID;
+ /**
+ * Invalid filter ID.
+ */
+ public static final int INVALID_FILTER_ID = Constants.Constant.INVALID_FILTER_ID;
+ /**
+ * Invalid AV Sync ID.
+ */
+ public static final int INVALID_AV_SYNC_ID = Constants.Constant.INVALID_AV_SYNC_ID;
/** @hide */
@IntDef(prefix = "SCAN_TYPE_", value = {SCAN_TYPE_UNDEFINED, SCAN_TYPE_AUTO, SCAN_TYPE_BLIND})