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

Commit 12eb0942 authored by Jae Seo's avatar Jae Seo Committed by Android (Google) Code Review
Browse files

Merge "TIF: Define activity action to set up channel sources" into nyc-dev

parents 355d731e a6d34ee8

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -22997,6 +22997,7 @@ package android.media.tv { 
    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_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 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

+1 −0
Original line number Diff line number Diff line
@@ -24708,6 +24708,7 @@ package android.media.tv { 
    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_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 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

+1 −0
Original line number Diff line number Diff line
@@ -23006,6 +23006,7 @@ package android.media.tv { 
    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_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 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/TvInputInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ public final class TvInputInfo implements Parcelable { 
    public static final int TYPE_DISPLAY_PORT = 1008;



    /**

     * The ID of the TV input to provide to the setup activity and settings activity.

     * Used as a String extra field in setup intents created by {@link #createSetupIntent()} to

     * supply the ID of a specific TV input to set up.

     */

    public static final String EXTRA_INPUT_ID = "android.media.tv.extra.INPUT_ID";

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

+8 −0
Original line number Diff line number Diff line
@@ -266,6 +266,14 @@ public final class TvInputManager { 
    public static final String META_DATA_CONTENT_RATING_SYSTEMS =

            "android.media.tv.metadata.CONTENT_RATING_SYSTEMS";



    /**

     * Activity action to set up channel sources i.e. TV inputs of type

     * {@link TvInputInfo#TYPE_TUNER}. When invoked, the system will display an appropriate UI for

     * the user to initiate the individual setup flow provided by

     * {@link android.R.attr#setupActivity} of each TV input service.

     */

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



    private final ITvInputManager mService;



    private final Object mLock = new Object();