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

Commit 3f051ff6 authored by Kangping Dong's avatar Kangping Dong Committed by Automerger Merge Worker
Browse files

Merge "[Thread] rename flags for Thread platform APIs" into main am: 8801a720 

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



Change-Id: Idfe70a057ba0479ad5f4c085829c51debfd8f3d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a7c5d4c 8801a720

core/api/current.txt

+3 −3
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ package android { 
    field public static final String MANAGE_DEVICE_POLICY_SYSTEM_APPS = "android.permission.MANAGE_DEVICE_POLICY_SYSTEM_APPS";

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

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

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

    field @FlaggedApi("com.android.net.thread.platform.flags.thread_user_restriction_enabled") public static final String MANAGE_DEVICE_POLICY_THREAD_NETWORK = "android.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK";

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

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

    field public static final String MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER = "android.permission.MANAGE_DEVICE_POLICY_USB_FILE_TRANSFER";
@@ -12983,7 +12983,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_platform") public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

    field @FlaggedApi("com.android.net.thread.platform.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";
@@ -33319,7 +33319,7 @@ package android.os { 
    field public static final String DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI = "no_sharing_admin_configured_wifi";

    field public static final String DISALLOW_SMS = "no_sms";

    field public static final String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";

    field @FlaggedApi("com.android.net.thread.flags.thread_user_restriction_enabled") public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";

    field @FlaggedApi("com.android.net.thread.platform.flags.thread_user_restriction_enabled") public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";

    field public static final String DISALLOW_ULTRA_WIDEBAND_RADIO = "no_ultra_wideband_radio";

    field public static final String DISALLOW_UNIFIED_PASSWORD = "no_unified_password";

    field public static final String DISALLOW_UNINSTALL_APPS = "no_uninstall_apps";

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -371,7 +371,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_platform") public static final String THREAD_NETWORK_PRIVILEGED = "android.permission.THREAD_NETWORK_PRIVILEGED";

    field @FlaggedApi("com.android.net.thread.platform.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";
@@ -3553,7 +3553,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_platform") public static final String THREAD_NETWORK_SERVICE = "thread_network";

    field @FlaggedApi("com.android.net.thread.platform.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 −3
Original line number Diff line number Diff line
@@ -4787,9 +4787,7 @@ public abstract class Context { 
     * @see android.net.thread.ThreadNetworkManager

     * @hide

     */

    // 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")

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

    @SystemApi

    public static final String THREAD_NETWORK_SERVICE = "thread_network";

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

+1 −3
Original line number Diff line number Diff line
@@ -3892,9 +3892,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.

     */

    // 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")

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

    @SdkConstant(SdkConstantType.FEATURE)

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

core/java/android/os/UserManager.java

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

     * @see #getUserRestrictions()

     */

    // 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")

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

    public static final String DISALLOW_THREAD_NETWORK = "no_thread_network";



    /**