diff options
author | Kangping Dong <wgtdkp@google.com> | 2024-01-10 21:08:34 +0800 |
---|---|---|
committer | Kangping Dong <wgtdkp@google.com> | 2024-02-01 15:08:37 +0000 |
commit | c501c0f70fc9fdb9305c628ea8651803ed851a5d (patch) | |
tree | cf6a2aedec4e80dfae289b4fa79862b813f23c69 | |
parent | 9f3fe75e3c611610149ec95314d5a34346f3cbe6 (diff) | |
download | Permission-c501c0f70fc9fdb9305c628ea8651803ed851a5d.tar.gz |
[Thread] add MANAGE_DEVICE_POLICY_THREAD_NETWORK for CTS
This commit reolves merge conflict in aosp/2900149
Bug: 323082932
Bug: 319198393
Merged-In: I76b8c05587d0a491b18cfdbbed98b660d15401bc
Change-Id: I76b8c05587d0a491b18cfdbbed98b660d15401bc
-rw-r--r-- | tests/cts/permissionpolicy/res/raw/android_manifest.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml index 5f9049841..e736e201a 100644 --- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml +++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml @@ -3444,6 +3444,13 @@ <permission android:name="android.permission.MANAGE_DEVICE_POLICY_NEARBY_COMMUNICATION" android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to <a + href="https://www.threadgroup.org">Thread</a> network. + @FlaggedApi("com.android.net.thread.flags.thread_user_restriction_enabled") + --> + <permission android:name="android.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK" + android:protectionLevel="internal|role" /> + <!-- Allows an application to set policy related to windows. <p>{@link Manifest.permission#MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL} is required to call APIs protected by this permission on users different to the calling user. |