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

Commit c648a4eb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add a TV_TUNER_RESOURCE_MGR_SERVICE in Android Framework Context" am: 1803b401 

Change-Id: Ie9a1ae8d778d8843cdcb7dd678aa8acafcac159f
parents b42dfed0 1803b401

core/java/android/content/Context.java

+12 −0
Original line number Diff line number Diff line
@@ -3356,6 +3356,7 @@ public abstract class Context { 
            CONSUMER_IR_SERVICE,

            //@hide: TRUST_SERVICE,

            TV_INPUT_SERVICE,

            //@hide: TV_TUNER_RESOURCE_MGR_SERVICE,

            //@hide: NETWORK_SCORE_SERVICE,

            USAGE_STATS_SERVICE,

            MEDIA_SESSION_SERVICE,
@@ -4585,6 +4586,17 @@ public abstract class Context { 
     */

    public static final String TV_INPUT_SERVICE = "tv_input";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.media.tv.tunerresourcemanager.TunerResourceManager} for interacting with TV

     * tuner resources on the device.

     *

     * @see #getSystemService(String)

     * @see android.media.tv.TunerResourceManager

     * @hide

     */

    public static final String TV_TUNER_RESOURCE_MGR_SERVICE = "tv_tuner_resource_mgr";



    /**

     * {@link android.net.NetworkScoreManager} for managing network scoring.

     * @see #getSystemService(String)