Merge "Flag broadcast visibility constants and unhide" into main (62923fc9) · Commits · e / os / android_frameworks_base

core/api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -26669,12 +26669,16 @@ package android.media.tv {

		public static final class TvContract.Channels implements android.media.tv.TvContract.BaseTvColumns {
		method @Nullable public static String getVideoResolution(String);
		field @FlaggedApi("android.media.tv.flags.broadcast_visibility_types") public static final int BROADCAST_VISIBILITY_TYPE_INVISIBLE = 2; // 0x2
		field @FlaggedApi("android.media.tv.flags.broadcast_visibility_types") public static final int BROADCAST_VISIBILITY_TYPE_NUMERIC_SELECTABLE_ONLY = 1; // 0x1
		field @FlaggedApi("android.media.tv.flags.broadcast_visibility_types") public static final int BROADCAST_VISIBILITY_TYPE_VISIBLE = 0; // 0x0
		field public static final String COLUMN_APP_LINK_COLOR = "app_link_color";
		field public static final String COLUMN_APP_LINK_ICON_URI = "app_link_icon_uri";
		field public static final String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";
		field public static final String COLUMN_APP_LINK_POSTER_ART_URI = "app_link_poster_art_uri";
		field public static final String COLUMN_APP_LINK_TEXT = "app_link_text";
		field public static final String COLUMN_BROADCAST_GENRE = "broadcast_genre";
		field @FlaggedApi("android.media.tv.flags.broadcast_visibility_types") public static final String COLUMN_BROADCAST_VISIBILITY_TYPE = "broadcast_visibility_type";
		field public static final String COLUMN_BROWSABLE = "browsable";
		field public static final String COLUMN_CHANNEL_LIST_ID = "channel_list_id";
		field public static final String COLUMN_DESCRIPTION = "description";

media/java/android/media/tv/TvContract.java

+11 −9

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.media.tv;

		import android.annotation.FlaggedApi;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -29,6 +30,7 @@ import android.content.ContentResolver;
		import android.content.ContentUris;
		import android.content.Context;
		import android.content.Intent;
		import android.media.tv.flags.Flags;
		import android.net.Uri;
		import android.os.Bundle;
		import android.os.IBinder;
		@@ -2540,9 +2542,9 @@ public final class TvContract {
		* <p>This is used to indicate the broadcast visibility type defined in the underlying
		* broadcast standard or country/operator profile, if applicable. For example,
		* {@code visible_service_flag} and {@code numeric_selection_flag} of
		* {@code service_attribute_descriptor} in D-Book, {@code visible_service_flag} and
		* {@code selectable_service_flag} of {@code ciplus_service_descriptor} in CI Plus 1.3
		* specification.
		* {@code service_attribute_descriptor} in D-Book, the specification for UK-based TV
		* products, {@code visible_service_flag} and {@code selectable_service_flag} of
		* {@code ciplus_service_descriptor} in the CI Plus 1.3 specification.
		*
		* <p>The value should match one of the following:
		* {@link #BROADCAST_VISIBILITY_TYPE_VISIBLE},
		@@ -2553,8 +2555,8 @@ public final class TvContract {
		* by default.
		*
		* <p>Type: INTEGER
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_BROADCAST_VISIBILITY_TYPES)
		public static final String COLUMN_BROADCAST_VISIBILITY_TYPE = "broadcast_visibility_type";

		/** @hide */
		@@ -2571,8 +2573,8 @@ public final class TvContract {
		* visible from users and selectable by users via normal service navigation mechanisms.
		*
		* @see #COLUMN_BROADCAST_VISIBILITY_TYPE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_BROADCAST_VISIBILITY_TYPES)
		public static final int BROADCAST_VISIBILITY_TYPE_VISIBLE = 0;

		/**
		@@ -2581,18 +2583,18 @@ public final class TvContract {
		* the logical channel number.
		*
		* @see #COLUMN_BROADCAST_VISIBILITY_TYPE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_BROADCAST_VISIBILITY_TYPES)
		public static final int BROADCAST_VISIBILITY_TYPE_NUMERIC_SELECTABLE_ONLY = 1;

		/**
		* The broadcast visibility type for invisible services. Use this type when the service
		* is invisible from users and unselectable by users via any of normal service navigation
		* mechanisms.
		* is invisible from users and not able to be selected by users via any of the normal
		* service navigation mechanisms.
		*
		* @see #COLUMN_BROADCAST_VISIBILITY_TYPE
		* @hide
		*/
		@FlaggedApi(Flags.FLAG_BROADCAST_VISIBILITY_TYPES)
		public static final int BROADCAST_VISIBILITY_TYPE_INVISIBLE = 2;

		private Channels() {}