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

Commit 2e7a92f1 authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Merge "TIF: Rename COLUMN_APP_LINK_INTENT_URI to COLUMN_INTENT_URI" into oc-dev 

am: 64731b1d

Change-Id: Id2737cf02080ba6b9a37dffba2a7727466ae07e5
parents f27cf9cb 64731b1d

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24544,12 +24544,12 @@ 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_AUTHOR = "author";

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

    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";

    field public static final java.lang.String COLUMN_CONTENT_ID = "content_id";

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

    field public static final java.lang.String COLUMN_INTENT_URI = "intent_uri";

    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";

    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";

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

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26485,12 +26485,12 @@ 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_AUTHOR = "author";

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

    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";

    field public static final java.lang.String COLUMN_CONTENT_ID = "content_id";

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

    field public static final java.lang.String COLUMN_INTENT_URI = "intent_uri";

    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";

    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";

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

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24657,12 +24657,12 @@ 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_AUTHOR = "author";

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

    field public static final java.lang.String COLUMN_BROWSABLE = "browsable";

    field public static final java.lang.String COLUMN_CONTENT_ID = "content_id";

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

    field public static final java.lang.String COLUMN_INTENT_URI = "intent_uri";

    field public static final java.lang.String COLUMN_INTERACTION_COUNT = "interaction_count";

    field public static final java.lang.String COLUMN_INTERACTION_TYPE = "interaction_type";

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

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

+3 −4
Original line number Diff line number Diff line
@@ -1299,18 +1299,17 @@ public final class TvContract { 
        String COLUMN_DURATION_MILLIS = "duration_millis";



        /**

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

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

         *

         * <p>The URI is created using {@link Intent#toUri} with {@link Intent#URI_INTENT_SCHEME}

         * and converted back to the original intent with {@link Intent#parseUri}. The intent is

         * launched when the user selects the preview video item.

         * launched when the user selects the preview program item.

         *

         * <p>Can be empty.

         *

         * <p>Type: TEXT

         */

        String COLUMN_APP_LINK_INTENT_URI =

                "app_link_intent_uri";

        String COLUMN_INTENT_URI = "intent_uri";



        /**

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