From 485c9f7ede57b4cca37841dfd99cd1c6badc2788 Mon Sep 17 00:00:00 2001 From: Conrad Chen Date: Thu, 9 Feb 2017 12:43:28 -0800 Subject: [PATCH] TIF: Add internal provider ID field to channels Test: build Bug: 35101383 Change-Id: Ic725da964a287a2aa434998dd4e5879ea1f8e6bd --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + media/java/android/media/tv/TvContract.java | 12 ++++++++++++ 4 files changed, 15 insertions(+) diff --git a/api/current.txt b/api/current.txt index a4c933fef7f63..0ad269b0c5b2b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24017,6 +24017,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name"; 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_ID = "internal_provider_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"; diff --git a/api/system-current.txt b/api/system-current.txt index a806153962c9e..06f3a5948cd77 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -25803,6 +25803,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name"; 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_ID = "internal_provider_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"; diff --git a/api/test-current.txt b/api/test-current.txt index b47331b42c008..1a9fb9f17525c 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -24110,6 +24110,7 @@ package android.media.tv { field public static final java.lang.String COLUMN_DISPLAY_NAME = "display_name"; 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_ID = "internal_provider_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"; diff --git a/media/java/android/media/tv/TvContract.java b/media/java/android/media/tv/TvContract.java index 45f88f3b2ac63..efb1ed7b47e72 100644 --- a/media/java/android/media/tv/TvContract.java +++ b/media/java/android/media/tv/TvContract.java @@ -1299,6 +1299,18 @@ public final class TvContract { */ public static final String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri"; + /** + * The internal ID used by individual TV input services. + * + *

This is internal to the provider that inserted it, and should not be decoded by other + * apps. + * + *

Can be empty. + * + *

Type: TEXT + */ + public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id"; + /** * Internal data used by individual TV input services. *