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

Commit 3b3e389f authored by Kangping Dong's avatar Kangping Dong Committed by Android (Google) Code Review
Browse files

Merge "[Thread] rename package name for Thread platform flags" into aosp-main-future

parents 1a5b79be 9cb44920

AconfigFlags.bp

+5 −5
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ aconfig_declarations_group { 
        "com.android.input.flags-aconfig-java",

        "com.android.internal.foldables.flags-aconfig-java",

        "com.android.media.flags.bettertogether-aconfig-java",

        "com.android.net.thread.flags-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.server.flags.pinner-aconfig-java",

        "com.android.text.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",
@@ -685,8 +685,8 @@ aconfig_declarations { 


// Thread network

aconfig_declarations {

    name: "com.android.net.thread.flags-aconfig",

    package: "com.android.net.thread.flags",

    name: "com.android.net.thread.platform.flags-aconfig",

    package: "com.android.net.thread.platform.flags",

    srcs: ["core/java/android/net/thread/flags.aconfig"],

}
@@ -698,8 +698,8 @@ java_aconfig_library { 
}



java_aconfig_library {

    name: "com.android.net.thread.flags-aconfig-java",

    aconfig_declarations: "com.android.net.thread.flags-aconfig",

    name: "com.android.net.thread.platform.flags-aconfig-java",

    aconfig_declarations: "com.android.net.thread.platform.flags-aconfig",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

core/java/android/content/Context.java

+3 −1
Original line number Diff line number Diff line
@@ -4787,7 +4787,9 @@ public abstract class Context { 
     * @see android.net.thread.ThreadNetworkManager

     * @hide

     */

    @FlaggedApi(com.android.net.thread.flags.Flags.FLAG_THREAD_ENABLED_PLATFORM)

    // TODO (b/325886480): update the flag to

    // "com.android.net.thread.platform.flags.Flags.FLAG_THREAD_ENABLED_PLATFORM"

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

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";

core/java/android/content/pm/PackageManager.java

+3 −1
Original line number Diff line number Diff line
@@ -3892,7 +3892,9 @@ public abstract class PackageManager { 
     * The device is capable of communicating with other devices via

     * <a href="https://www.threadgroup.org">Thread</a> networking protocol.

     */

    @FlaggedApi(com.android.net.thread.flags.Flags.FLAG_THREAD_ENABLED_PLATFORM)

    // TODO (b/325886480): update the flag to

    // "com.android.net.thread.platform.flags.Flags.FLAG_THREAD_ENABLED_PLATFORM"

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

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

core/java/android/net/thread/flags.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.net.thread.flags"

package: "com.android.net.thread.platform.flags"



# This file contains aconfig flags used from platform code

# Flags used for module APIs must be in aconfig files under each modules

core/java/android/os/UserManager.java

+3 −1
Original line number Diff line number Diff line
@@ -1902,7 +1902,9 @@ public class UserManager { 
     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    @FlaggedApi(com.android.net.thread.flags.Flags.FLAG_THREAD_USER_RESTRICTION_ENABLED)

    // TODO (b/325886480): update the flag to

    // "com.android.net.thread.platform.flags.Flags.FLAG_THREAD_USER_RESTRICTION_ENABLED"

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

    public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";



    /**