From bd6148f70e3736bc495bafc5c17725edcb7ec2d2 Mon Sep 17 00:00:00 2001 From: Kangping Dong Date: Tue, 9 Jan 2024 15:17:24 +0800 Subject: [Thread] add permission MANAGE_DEVICE_POLICY_THREAD_NETWORK Add this permission for Thread user restrictions control. See go/ae-v-thread-admin-control Bug: 319198393 Merged-In: Ie8393cf876435a3ffb77a4b27bcf419b529fd785 Change-Id: Ie8393cf876435a3ffb77a4b27bcf419b529fd785 --- core/api/current.txt | 1 + core/res/AndroidManifest.xml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 7d3c82e643e4..e26632a72183 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -193,6 +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 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"; diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bc74f397fa35..f5635f450268 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -3522,6 +3522,13 @@ + + +