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

Commit 42fee32c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Make Context#TETHERING_SERVICE public API" into main am: 43b304a2 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3464423



Change-Id: I5e2ce5d03e796932c81147f4bf27132f2871e25d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 820489db 43b304a2

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10853,6 +10853,7 @@ package android.content { 
    field public static final String TELEPHONY_IMS_SERVICE = "telephony_ims";

    field public static final String TELEPHONY_SERVICE = "phone";

    field public static final String TELEPHONY_SUBSCRIPTION_SERVICE = "telephony_subscription_service";

    field public static final String TETHERING_SERVICE = "tethering";

    field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";

    field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";

    field @FlaggedApi("android.media.tv.flags.enable_ad_service_fw") public static final String TV_AD_SERVICE = "tv_ad";

core/api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -3851,7 +3851,6 @@ package android.content { 
    field public static final String STATS_MANAGER = "stats";

    field public static final String SYSTEM_CONFIG_SERVICE = "system_config";

    field public static final String SYSTEM_UPDATE_SERVICE = "system_update";

    field public static final String TETHERING_SERVICE = "tethering";

    field @FlaggedApi("com.android.net.thread.platform.flags.thread_enabled_platform") public static final String THREAD_NETWORK_SERVICE = "thread_network";

    field public static final String TIME_MANAGER_SERVICE = "time_manager";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

core/java/android/content/Context.java

+2 −2
Original line number Diff line number Diff line
@@ -4894,10 +4894,10 @@ public abstract class Context { 
    /**

     * Use with {@link #getSystemService(String)} to retrieve a {@link android.net.TetheringManager}

     * for managing tethering functions.

     * @hide

     *

     * @see android.net.TetheringManager

     */

    @SystemApi

    @SuppressLint("UnflaggedApi")

    public static final String TETHERING_SERVICE = "tethering";



    /**