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

Commit 9cb44920 authored by Kangping Dong's avatar Kangping Dong
Browse files

[Thread] rename package name for Thread platform flags 

(This is a cherry-pick of aosp/2968526 for resolving merge conflicts)

There are two Thread flag files in frameworks/base and
packages/modules/Connectivity/thread. Both are currently using the same
"com.android.net.thread.flags" package name for their flags. While all
flags needs to be built in a aconfig_declarations target, two aconfig_declarations
can't have the same package name:

```
FAILED: out/soong/build.aosp_arm.ninja
cd "$(dirname "out/host/linux-x86/bin/soong_build")" && BUILDER="$PWD/$(basename "out/host/linux-x86/bin/soong_build")" && cd / && env -i  "$BUILDER"     --top "$TOP"     --soong_out "out/soong"     --out "out"     --soong_variables out/soong/soong.aosp_arm.variables -o out/soong/b
uild.aosp_arm.ninja --globListDir aosp_arm --globFile out/soong/globs-aosp_arm.ninja -l out/.module_paths/Android.bp.list --available_env out/soong/soong.environment.available --used_env out/soong/soong.environment.used.aosp_arm.build Android.bp
2 aconfig_declarations found for package com.android.net.thread.flags
```

To resolve this issue, this commit renames the platform flags to package
name "android.net.thread.platform.flags".

This commit is required by ag/26286387

Bug: 325886480
Merged-In: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f
Change-Id: Icacf88f7c0aa499b4b29f4072ae58840f0b1761f
parent ea971883

AconfigFlags.bp

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

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

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

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

        "com.android.media.flags.bettertogether-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.server.flags.pinner-aconfig-java",

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

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

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

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




// Thread network

// Thread network

aconfig_declarations {

aconfig_declarations {

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

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

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

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

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

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

}

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

}





java_aconfig_library {

java_aconfig_library {

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

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

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

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

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

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

}

}

core/java/android/content/Context.java

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

     * @see android.net.thread.ThreadNetworkManager

     * @hide

     * @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

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";

    public static final String THREAD_NETWORK_SERVICE = "thread_network";

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

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

     * The device is capable of communicating with other devices via

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

     * <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)

    @SdkConstant(SdkConstantType.FEATURE)

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

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

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

+1 −1
Original line number Original line 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

# This file contains aconfig flags used from platform code

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

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

core/java/android/os/UserManager.java

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

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     * @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";

    public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";





    /**

    /**