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

Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract"

Browse Source
This commit is contained in:
Dongwon Kang
2015-03-19 00:20:10 +00:00
committed by Android (Google) Code Review
parent 10c6e230bc 4536512f35
commit 28299099db
3 changed files with 52 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -17170,6 +17170,10 @@ package android.media.tv {
field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";
field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";
field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";

4
api/system-current.txt
View File

@@ -18438,6 +18438,10 @@ package android.media.tv {
field public static final java.lang.String COLUMN_DISPLAY_NUMBER = "display_number";
field public static final java.lang.String COLUMN_INPUT_ID = "input_id";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
field public static final java.lang.String COLUMN_LOCKED = "locked";
field public static final java.lang.String COLUMN_NETWORK_AFFILIATION = "network_affiliation";
field public static final java.lang.String COLUMN_ORIGINAL_NETWORK_ID = "original_network_id";

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

@@ -732,6 +732,50 @@ public final class TvContract {
*/
public static final String COLUMN_INTERNAL_PROVIDER_DATA = "internal_provider_data";
/**
* Internal integer flag used by individual TV input services.
* <p>
* This is internal to the provider that inserted it, and should not be decoded by other
* apps.
* </p><p>
* Type: INTEGER
* </p>
*/
public static final String COLUMN_INTERNAL_PROVIDER_FLAG1 = "internal_provider_flag1";
/**
* Internal integer flag used by individual TV input services.
* <p>
* This is internal to the provider that inserted it, and should not be decoded by other
* apps.
* </p><p>
* Type: INTEGER
* </p>
*/
public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
/**
* Internal integer flag used by individual TV input services.
* <p>
* This is internal to the provider that inserted it, and should not be decoded by other
* apps.
* </p><p>
* Type: INTEGER
* </p>
*/
public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
/**
* Internal integer flag used by individual TV input services.
* <p>
* This is internal to the provider that inserted it, and should not be decoded by other
* apps.
* </p><p>
* Type: INTEGER
* </p>
*/
public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
/**
* The version number of this row entry used by TV input services.
* <p>