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

Merge "Add a constant for ISDB_S3"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-28 19:17:09 +00:00
committed by Android (Google) Code Review
parent 4f7a858117 71fe12bb84
commit ad0db6fcda
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -27681,6 +27681,7 @@ package android.media.tv {
field public static final String TYPE_DVB_T2 = "TYPE_DVB_T2";
field public static final String TYPE_ISDB_C = "TYPE_ISDB_C";
field public static final String TYPE_ISDB_S = "TYPE_ISDB_S";
field public static final String TYPE_ISDB_S3 = "TYPE_ISDB_S3";
field public static final String TYPE_ISDB_T = "TYPE_ISDB_T";
field public static final String TYPE_ISDB_TB = "TYPE_ISDB_TB";
field public static final String TYPE_NTSC = "TYPE_NTSC";

11
media/java/android/media/tv/TvContract.java
View File

@@ -20,9 +20,9 @@ import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
import android.annotation.StringDef;
import android.annotation.SystemApi;
import android.annotation.SdkConstant.SdkConstantType;
import android.app.Activity;
import android.content.ComponentName;
import android.content.ContentResolver;
@@ -1680,6 +1680,7 @@ public final class TvContract {
TYPE_ISDB_T,
TYPE_ISDB_TB,
TYPE_ISDB_S,
TYPE_ISDB_S3,
TYPE_ISDB_C,
TYPE_1SEG,
TYPE_DTMB,
@@ -1820,6 +1821,13 @@ public final class TvContract {
*/
public static final String TYPE_ISDB_S = "TYPE_ISDB_S";
/**
* The channel type for ISDB-S3 (satellite).
*
* @see #COLUMN_TYPE
*/
public static final String TYPE_ISDB_S3 = "TYPE_ISDB_S3";
/**
* The channel type for ISDB-C (cable).
*
@@ -2026,6 +2034,7 @@ public final class TvContract {
* {@link #TYPE_DVB_T2},
* {@link #TYPE_ISDB_C},
* {@link #TYPE_ISDB_S},
* {@link #TYPE_ISDB_S3},
* {@link #TYPE_ISDB_T},
* {@link #TYPE_ISDB_TB},
* {@link #TYPE_NTSC},