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

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

Merge "Add intent to intialize programs on APP installed" into oc-dev 

am: 9c1e8538

Change-Id: I806f2287b78670d3bcb8eef05c37e4581ad68985
parents 2528aced 9c1e8538

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24552,6 +24552,7 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26522,6 +26522,7 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24665,6 +24665,7 @@ package android.media.tv { 
    method public static boolean isChannelUriForPassthroughInput(android.net.Uri);

    method public static boolean isChannelUriForTunerInput(android.net.Uri);

    method public static boolean isProgramUri(android.net.Uri);

    field public static final java.lang.String ACTION_INITIALIZE_PROGRAMS = "android.media.tv.action.INITIALIZE_PROGRAMS";

    field public static final java.lang.String ACTION_MAKE_CHANNEL_BROWSABLE = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT = "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";

    field public static final java.lang.String ACTION_PREVIEW_PROGRAM_BROWSABLE_DISABLED = "android.media.tv.action.PREVIEW_PROGRAM_BROWSABLE_DISABLED";

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

+17 −0
Original line number Diff line number Diff line
@@ -129,6 +129,23 @@ public final class TvContract { 
    public static final String ACTION_PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT =

            "android.media.tv.action.PREVIEW_PROGRAM_ADDED_TO_WATCH_NEXT";



    /**

     * Broadcast Action: sent to the target TV input after it is first installed to notify the input

     * to initialize its channels and programs to the system content provider.

     *

     * <p>Note that this intent is sent only on devices with

     * {@link android.content.pm.PackageManager#FEATURE_LEANBACK} enabled. Besides that, in order

     * to receive this intent, the target TV input must:

     * <ul>

     *     <li>Declare a broadcast receiver for this intent in its

     *         <code>AndroidManifest.xml</code>.</li>

     *     <li>Declare appropriate permissions to write channel and program data in its

     *         <code>AndroidManifest.xml</code>.</li>

     * </ul>

     */

    public static final String ACTION_INITIALIZE_PROGRAMS =

            "android.media.tv.action.INITIALIZE_PROGRAMS";



    /** The key for a bundle parameter containing a channel ID as a long integer */

    public static final String EXTRA_CHANNEL_ID = "android.media.tv.extra.CHANNEL_ID";