Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eedc4b5b authored by Dongwon Kang's avatar Dongwon Kang
Browse files

TIF: change the column names to be consistent with other fields 

1. Add _MILLIS for time related columns.
2. Remove PREVIEW_ prefix.
(COLUMN_PREVIEW_VIDEO_URI is an exception since the meaning is not
clear without it.)
3. Add _URI for COLUMN_LOGO

Test: cts-tradefed run cts -m CtsTvTestCases
Bug: 34806184
Change-Id: I1c75b0402508911a37491c7712f12574e574fb9b
parent f0fac1d1

api/current.txt

+7 −7
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 {










@@ -23907,6 +23907,7 @@ package android.media.tv {













    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";















    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";















    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";













    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";















    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";















    field public static final java.lang.String COLUMN_AUTHOR = "author";















    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









@@ -23914,6 +23915,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";















    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";















    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";













    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";















    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";















    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









@@ -23927,17 +23929,14 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";













    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";















    field public static final java.lang.String COLUMN_LIVE = "live";













    field public static final java.lang.String COLUMN_LOGO = "logo";













    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";















    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";















    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";















    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";















    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";













    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";













    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";













    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";















    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";













    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";















    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";















    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";















    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";









@@ -23957,6 +23956,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";















    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";













    field public static final java.lang.String COLUMN_WEIGHT = "weight";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";















    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";















    field public static final android.net.Uri CONTENT_URI;










@@ -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



+7
−7




























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 {










@@ -25655,6 +25655,7 @@ package android.media.tv {













    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";















    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";















    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";













    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";















    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";















    field public static final java.lang.String COLUMN_AUTHOR = "author";















    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









@@ -25662,6 +25663,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";















    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";















    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";













    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";















    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";















    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









@@ -25675,17 +25677,14 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";













    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";















    field public static final java.lang.String COLUMN_LIVE = "live";













    field public static final java.lang.String COLUMN_LOGO = "logo";













    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";















    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";















    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";















    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";















    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";













    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";













    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";













    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";















    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";













    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";















    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";















    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";















    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";









@@ -25706,6 +25705,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";















    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";













    field public static final java.lang.String COLUMN_WEIGHT = "weight";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";















    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";















    field public static final android.net.Uri CONTENT_URI;










@@ -46021,11 +46021,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



+7
−7




























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 {










@@ -23999,6 +23999,7 @@ package android.media.tv {













    field public static final java.lang.String AVAILABILITY_AVAILABLE = "AVAILABILITY_AVAILABLE";















    field public static final java.lang.String AVAILABILITY_FREE_WITH_SUBSCRIPTION = "AVAILABILITY_FREE_WITH_SUBSCRIPTION";















    field public static final java.lang.String AVAILABILITY_PAID_CONTENT = "AVAILABILITY_PAID_CONTENT";













    field public static final java.lang.String COLUMN_APP_LINK_INTENT_URI = "app_link_intent_uri";















    field public static final java.lang.String COLUMN_AUDIO_LANGUAGE = "audio_language";















    field public static final java.lang.String COLUMN_AUTHOR = "author";















    field public static final java.lang.String COLUMN_AVAILABILITY = "availability";









@@ -24006,6 +24007,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_CANONICAL_GENRE = "canonical_genre";















    field public static final java.lang.String COLUMN_CHANNEL_ID = "channel_id";















    field public static final java.lang.String COLUMN_CONTENT_RATING = "content_rating";













    field public static final java.lang.String COLUMN_DURATION_MILLIS = "duration_millis";















    field public static final java.lang.String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";















    field public static final java.lang.String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";















    field public static final deprecated java.lang.String COLUMN_EPISODE_NUMBER = "episode_number";









@@ -24019,17 +24021,14 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";















    field public static final java.lang.String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";















    field public static final java.lang.String COLUMN_ITEM_COUNT = "item_count";













    field public static final java.lang.String COLUMN_LAST_PLAYBACK_POSITION_MILLIS = "last_playback_position_millis";















    field public static final java.lang.String COLUMN_LIVE = "live";













    field public static final java.lang.String COLUMN_LOGO = "logo";













    field public static final java.lang.String COLUMN_LOGO_URI = "logo_uri";















    field public static final java.lang.String COLUMN_LONG_DESCRIPTION = "long_description";















    field public static final java.lang.String COLUMN_OFFER_PRICE = "offer_price";















    field public static final java.lang.String COLUMN_POSTER_ART_ASPECT_RATIO = "poster_art_aspect_ratio";















    field public static final java.lang.String COLUMN_POSTER_ART_URI = "poster_art_uri";













    field public static final java.lang.String COLUMN_PREVIEW_DURATION = "preview_duration";













    field public static final java.lang.String COLUMN_PREVIEW_INTENT_URI = "preview_intent_uri";













    field public static final java.lang.String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION = "preview_last_playback_position";















    field public static final java.lang.String COLUMN_PREVIEW_VIDEO_URI = "preview_video_uri";













    field public static final java.lang.String COLUMN_PREVIEW_WEIGHT = "preview_weight";















    field public static final java.lang.String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";















    field public static final java.lang.String COLUMN_RELEASE_DATE = "release_date";















    field public static final java.lang.String COLUMN_REVIEW_RATING = "review_rating";









@@ -24049,6 +24048,7 @@ package android.media.tv {













    field public static final java.lang.String COLUMN_VIDEO_HEIGHT = "video_height";















    field public static final java.lang.String COLUMN_VIDEO_WIDTH = "video_width";















    field public static final java.lang.String COLUMN_WATCH_NEXT_TYPE = "watch_next_type";













    field public static final java.lang.String COLUMN_WEIGHT = "weight";















    field public static final java.lang.String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/program";















    field public static final java.lang.String CONTENT_TYPE = "vnd.android.cursor.dir/program";















    field public static final android.net.Uri CONTENT_URI;










@@ -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



+7
−7




























Original line number
Diff line number
Diff line








@@ -1665,7 +1665,7 @@ public final class TvContract {













         *















         * <p>Type: TEXT















         */













        public static final String COLUMN_LOGO = "logo";













        public static final String COLUMN_LOGO_URI = "logo_uri";































        /**















         * The availability of this TV program.










@@ -1860,8 +1860,8 @@ public final class TvContract {













         *















         * <p>Type: INTEGER















         */













        public static final String COLUMN_PREVIEW_LAST_PLAYBACK_POSITION =













                "preview_last_playback_position";













        public static final String COLUMN_LAST_PLAYBACK_POSITION_MILLIS =













                "last_playback_position_millis";































        /**















         * The duration (in milliseconds) of the preview video.









@@ -1872,7 +1872,7 @@ public final class TvContract {













         *















         * <p>Type: INTEGER















         */













        public static final String COLUMN_PREVIEW_DURATION = "preview_duration";













        public static final String COLUMN_DURATION_MILLIS = "duration_millis";































        /**















         * The intent URI which is launched when the preview video is selected.









@@ -1885,8 +1885,8 @@ public final class TvContract {













         *















         * <p>Type: TEXT















         */













        public static final String COLUMN_PREVIEW_INTENT_URI =













                "preview_intent_uri";













        public static final String COLUMN_APP_LINK_INTENT_URI =













                "app_link_intent_uri";































        /**















         * The weight of the preview program within the channel.









@@ -1900,7 +1900,7 @@ public final class TvContract {













         *















         * <p>Type: INTEGER















         */













        public static final String COLUMN_PREVIEW_WEIGHT = "preview_weight";













        public static final String COLUMN_WEIGHT = "weight";































        /**















         * The flag indicating whether this program is transient or not.