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

Commit 6a6e615f authored by Kangping Dong's avatar Kangping Dong Committed by Gerrit Code Review
Browse files

Merge "[Thread] define the THREAD_NETWORK_SERVICE" into main

parents 25552607 5996288d

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2976,6 +2976,7 @@ package android.content { 
    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 public static final String THREAD_NETWORK_SERVICE = "thread_network";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

    field public static final String UWB_SERVICE = "uwb";

core/java/android/content/Context.java

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

            VIBRATOR_SERVICE,

            //@hide: STATUS_BAR_SERVICE,

            THREAD_NETWORK_SERVICE,

            CONNECTIVITY_SERVICE,

            PAC_PROXY_SERVICE,

            VCN_MANAGEMENT_SERVICE,
@@ -4494,6 +4495,20 @@ public abstract class Context { 
    @SystemApi

    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

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