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

Commit 7931009c authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] define the THREAD_NETWORK_SERVICE" into udc-dev-plus-aosp am:... 

Merge "[Thread] define the THREAD_NETWORK_SERVICE" into udc-dev-plus-aosp am: b5ee4ce5 am: ad369cb3

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



Change-Id: Id547794adb736610e59fbddd1f1b331a210baed0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c62b8d4e ad369cb3

core/api/system-current.txt

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

    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 SYSTEM_UPDATE_SERVICE = "system_update";

    field public static final String TETHERING_SERVICE = "tethering";

    field public static final String TETHERING_SERVICE = "tethering";

    field public static final String THREAD_NETWORK_SERVICE = "thread_network";

    field public static final String TIME_MANAGER_SERVICE = "time_manager";

    field public static final String TIME_MANAGER_SERVICE = "time_manager";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

core/java/android/content/Context.java

+15 −0
Original line number Original line Diff line number Diff line
@@ -4081,6 +4081,7 @@ public abstract class Context { 
            VIBRATOR_MANAGER_SERVICE,

            VIBRATOR_MANAGER_SERVICE,

            VIBRATOR_SERVICE,

            VIBRATOR_SERVICE,

            //@hide: STATUS_BAR_SERVICE,

            //@hide: STATUS_BAR_SERVICE,

            THREAD_NETWORK_SERVICE,

            CONNECTIVITY_SERVICE,

            CONNECTIVITY_SERVICE,

            PAC_PROXY_SERVICE,

            PAC_PROXY_SERVICE,

            VCN_MANAGEMENT_SERVICE,

            VCN_MANAGEMENT_SERVICE,
@@ -4754,6 +4755,20 @@ public abstract class Context { 
    @SystemApi

    @SystemApi

    public static final String TETHERING_SERVICE = "tethering";

    public static final String TETHERING_SERVICE = "tethering";





    /**

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

     * {@link android.net.thread.ThreadNetworkManager}.

     *

     * <p>On devices without {@link PackageManager#FEATURE_THREAD_NETWORK} system feature

     * the {@link #getSystemService(String)} will return {@code null}.

     *

     * @see #getSystemService(String)

     * @see android.net.thread.ThreadNetworkManager

     * @hide

     */

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";



    /**

    /**

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

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

     * {@link android.net.IpSecManager} for encrypting Sockets or Networks with

     * {@link android.net.IpSecManager} for encrypting Sockets or Networks with