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

Commit 10dcfd36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add an intent that asks the launcher to make a channel browsable."

parents 60d820b0 4bf00a2c

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -24012,10 +24012,13 @@ package android.media.tv { 
    method public void unregisterCallback(android.media.tv.TvInputManager.TvInputCallback);

    method public void updateTvInputInfo(android.media.tv.TvInputInfo);

    field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED";

    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_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

    field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";

    field public static final int INPUT_STATE_CONNECTED = 0; // 0x0

    field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1

    field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -25840,10 +25840,13 @@ package android.media.tv { 
    method public void unregisterCallback(android.media.tv.TvInputManager.TvInputCallback);

    method public void updateTvInputInfo(android.media.tv.TvInputInfo);

    field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED";

    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_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

    field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";

    field public static final int INPUT_STATE_CONNECTED = 0; // 0x0

    field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1

    field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -24103,10 +24103,13 @@ package android.media.tv { 
    method public void unregisterCallback(android.media.tv.TvInputManager.TvInputCallback);

    method public void updateTvInputInfo(android.media.tv.TvInputInfo);

    field public static final java.lang.String ACTION_BLOCKED_RATINGS_CHANGED = "android.media.tv.action.BLOCKED_RATINGS_CHANGED";

    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_PARENTAL_CONTROLS_ENABLED_CHANGED = "android.media.tv.action.PARENTAL_CONTROLS_ENABLED_CHANGED";

    field public static final java.lang.String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";

    field public static final java.lang.String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";

    field public static final java.lang.String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";

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

    field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";

    field public static final int INPUT_STATE_CONNECTED = 0; // 0x0

    field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1

    field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2

media/java/android/media/tv/TvInputManager.java

+18 −0
Original line number Diff line number Diff line
@@ -324,6 +324,24 @@ public final class TvInputManager { 
    public static final String ACTION_VIEW_RECORDING_SCHEDULES =

            "android.media.tv.action.VIEW_RECORDING_SCHEDULES";



    /**

     * Action sent by an application telling the system to set the given channel as browsable.

     *

     * <p>The intent must contain the following bundle parameters:

     * <ul>

     *     <li>{@link #EXTRA_CHANNEL_ID} then channel ID as an integer.

     *     <li>{@link #EXTRA_PACKAGE_NAME} the package name of the requesting application.

     * </ul>

     */

    public static final String ACTION_MAKE_CHANNEL_BROWSABLE

            = "android.media.tv.action.MAKE_CHANNEL_BROWSABLE";



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

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



    /** The key for a bundle parameter containing a package name as a string. */

    public static final String EXTRA_PACKAGE_NAME = "android.media.tv.extra.PACKAGE_NAME";



    private final ITvInputManager mService;



    private final Object mLock = new Object();