TIF: add COLUMN_SYSTEM_APPROVED in Channels (72529d0f) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15246,11 +15246,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -42618,11 +42618,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -15824,11 +15824,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -25589,6 +25589,7 @@ package android.media.tv {
		field public static final java.lang.String COLUMN_SEARCHABLE = "searchable";
		field public static final java.lang.String COLUMN_SERVICE_ID = "service_id";
		field public static final java.lang.String COLUMN_SERVICE_TYPE = "service_type";
		field public static final java.lang.String COLUMN_SYSTEM_APPROVED = "system_approved";
		field public static final java.lang.String COLUMN_TRANSIENT = "transient";
		field public static final java.lang.String COLUMN_TRANSPORT_STREAM_ID = "transport_stream_id";
		field public static final java.lang.String COLUMN_TYPE = "type";
		@@ -46021,11 +46022,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

api/test-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15280,11 +15280,11 @@ package android.hardware.display {
		method public void unregisterDisplayListener(android.hardware.display.DisplayManager.DisplayListener);
		field public static final java.lang.String DISPLAY_CATEGORY_PRESENTATION = "android.hardware.display.category.PRESENTATION";
		field public static final int VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16; // 0x10
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8; // 0x8
		field public static final int VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2; // 0x2
		field public static final int VIRTUAL_DISPLAY_FLAG_PUBLIC = 1; // 0x1
		field public static final int VIRTUAL_DISPLAY_FLAG_SECURE = 4; // 0x4
		field public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		}

		public static abstract interface DisplayManager.DisplayListener {
		@@ -42922,11 +42922,11 @@ package android.view {
		method public boolean isValid();
		method public boolean isWideColorGamut();
		field public static final int DEFAULT_DISPLAY = 0; // 0x0
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_PRESENTATION = 8; // 0x8
		field public static final int FLAG_PRIVATE = 4; // 0x4
		field public static final int FLAG_ROUND = 16; // 0x10
		field public static final int FLAG_SECURE = 2; // 0x2
		field public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 32; // 0x20
		field public static final int FLAG_SUPPORTS_PROTECTED_BUFFERS = 1; // 0x1
		field public static final int INVALID_DISPLAY = -1; // 0xffffffff
		field public static final int STATE_DOZE = 3; // 0x3

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -1026,6 +1026,19 @@ public final class TvContract {
		@SystemApi
		public static final String COLUMN_TRANSIENT = "transient";

		/**
		* The flag indicating whether this TV channel is approved to be shown by the system.
		*
		* <p>A value of 1 indicates that the channel is approved to be shown by the system, and a
		* value of 0 indicates that the channel is blocked by system. If not specified, this value
		* is set to 0 (not approved) by default.
		*
		* <p>Type: INTEGER (boolean)
		* @hide
		*/
		@SystemApi
		public static final String COLUMN_SYSTEM_APPROVED = "system_approved";

		private Channels() {}

		/**