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

Commit 20e47dfe authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] flagging the THREAD_NETWORK_SERVICE API" into main am:... 

Merge "[Thread] flagging the THREAD_NETWORK_SERVICE API" into main am: 55722bf5 am: c567a23d am: 1ff7e3ba

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



Change-Id: I50f0dd58060cbe48833b87bbc811a9ac1c912b05
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f0e9876 1ff7e3ba

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3487,7 +3487,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 @FlaggedApi("com.android.net.thread.flags.thread_enabled") 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";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

core/java/android/content/Context.java

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.ColorInt; 
import android.annotation.ColorRes;

import android.annotation.DisplayContext;

import android.annotation.DrawableRes;

import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.LongDef;

import android.annotation.NonNull;
@@ -4773,6 +4774,7 @@ public abstract class Context { 
     * @see android.net.thread.ThreadNetworkManager

     * @hide

     */

    @FlaggedApi("com.android.net.thread.flags.thread_enabled")

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";