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

Commit d798d7b4 authored by Motomu Utsumi's avatar Motomu Utsumi
Browse files

Renamed thread_enabled flag to thread_enabled_platform 

thread_enabled flag is used in Connectivity module.
The module and the platform are not built together, so using the same
flag for both may lead the flag value mismatches.

This CL also adds thread_enabled_platform to flags.aconfig file

Test: TH
Change-Id: I1be418e807c77c456cdcfa99824d3d37b00edcd6
parent c70419af

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -12739,7 +12739,7 @@ package android.content.pm { 
    field public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio.access";

    field public static final String FEATURE_TELEPHONY_SUBSCRIPTION = "android.hardware.telephony.subscription";

    field @Deprecated public static final String FEATURE_TELEVISION = "android.hardware.type.television";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled") public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled_platform") public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

    field public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";

    field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ package android { 
    field public static final String SYSTEM_APPLICATION_OVERLAY = "android.permission.SYSTEM_APPLICATION_OVERLAY";

    field public static final String SYSTEM_CAMERA = "android.permission.SYSTEM_CAMERA";

    field public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled") public static final String THREAD_NETWORK_PRIVILEGED = "android.permission.THREAD_NETWORK_PRIVILEGED";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled_platform") public static final String THREAD_NETWORK_PRIVILEGED = "android.permission.THREAD_NETWORK_PRIVILEGED";

    field public static final String TIS_EXTENSION_INTERFACE = "android.permission.TIS_EXTENSION_INTERFACE";

    field public static final String TOGGLE_AUTOMOTIVE_PROJECTION = "android.permission.TOGGLE_AUTOMOTIVE_PROJECTION";

    field public static final String TRIGGER_LOST_MODE = "android.permission.TRIGGER_LOST_MODE";
@@ -3482,7 +3482,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 @FlaggedApi("com.android.net.thread.flags.thread_enabled") public static final String THREAD_NETWORK_SERVICE = "thread_network";

    field @FlaggedApi("com.android.net.thread.flags.thread_enabled_platform") 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

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

     * @hide

     */

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

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

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";

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

+1 −1
Original line number Diff line number Diff line
@@ -3756,7 +3756,7 @@ 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.thread_enabled")

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

    @SdkConstant(SdkConstantType.FEATURE)

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

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

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



# This file contains aconfig flags used from platform code

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



flag {

    name: "thread_user_restriction_enabled"

    namespace: "thread_network"

    description: "Controls whether user restriction on thread networks is enabled"

    bug: "307679182"

}



flag {

    name: "thread_enabled_platform"

    namespace: "thread_network"

    description: "Controls whether the Android Thread feature is enabled"

    bug: "301473012"

}