summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alex Johnston <acjohnston@google.com> 2024-10-29 15:42:54 +0000
committer Alex Johnston <acjohnston@google.com> 2024-11-18 22:26:19 +0000
commit58f82b3ab3dbed5e82090b876b86961ada62fd9a (patch)
tree776895e89b9593e28aa553a35cc32680f9b55afc
parentd4c92954f3f1c086a86072e93e21c1493221101a (diff)
Add hidden SystemAPI permissions required for copyAccount and removeAccount
Give the device policy management role the copy and remove account permissions Bug: 375382324 Test: atest PermissionPolicyTest Relnote: N/A Flag: android.app.admin.flags.split_create_managed_profile_enabled Change-Id: I558608eb4359a396a554cacff261c35d0baef463 LOW_COVERAGE_REASON=NON_CODE_ONLY
-rw-r--r--PermissionController/res/xml/roles.xml8
-rw-r--r--tests/cts/permissionpolicy/res/raw/android_manifest.xml16
2 files changed, 24 insertions, 0 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 64642f403..6864506f0 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -720,6 +720,10 @@
featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" />
<permission name="android.permission.EXECUTE_APP_FUNCTIONS_TRUSTED"
featureFlag="android.app.appfunctions.flags.Flags.enableAppFunctionManager" />
+ <permission name="android.permission.COPY_ACCOUNTS"
+ featureFlag="android.permission.flags.Flags.devicePolicyManagementRoleSplitCreateManagedProfileEnabled" />
+ <permission name="android.permission.REMOVE_ACCOUNTS"
+ featureFlag="android.permission.flags.Flags.devicePolicyManagementRoleSplitCreateManagedProfileEnabled" />
</permissions>
</role>
@@ -1480,6 +1484,10 @@
<permission name="android.permission.MANAGE_DEVICE_POLICY_DISPLAY" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_LOCALE" minSdkVersion="35" />
<permission name="android.permission.MANAGE_DEVICE_POLICY_SMS" minSdkVersion="35" />
+ <permission name="android.permission.COPY_ACCOUNTS"
+ featureFlag="android.permission.flags.Flags.devicePolicyManagementRoleSplitCreateManagedProfileEnabled" />
+ <permission name="android.permission.REMOVE_ACCOUNTS"
+ featureFlag="android.permission.flags.Flags.devicePolicyManagementRoleSplitCreateManagedProfileEnabled" />
</permissions>
</role>
diff --git a/tests/cts/permissionpolicy/res/raw/android_manifest.xml b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
index 6efe6b8bb..067364ac4 100644
--- a/tests/cts/permissionpolicy/res/raw/android_manifest.xml
+++ b/tests/cts/permissionpolicy/res/raw/android_manifest.xml
@@ -2574,6 +2574,22 @@
android:label="@string/permlab_getAccounts" />
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+ <!-- @SystemApi Allows access to remove an account.
+ @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled")
+ <p>Not for use by third-party applications.
+ @hide -->
+ <permission android:name="android.permission.REMOVE_ACCOUNTS"
+ android:protectionLevel="signature|role"
+ android:featureFlag="android.app.admin.flags.split_create_managed_profile_enabled" />
+
+ <!-- @SystemApi Allows access to copy an account to another user.
+ @FlaggedApi("android.app.admin.flags.split_create_managed_profile_enabled")
+ <p>Not for use by third-party applications.
+ @hide -->
+ <permission android:name="android.permission.COPY_ACCOUNTS"
+ android:protectionLevel="signature|role"
+ android:featureFlag="android.app.admin.flags.split_create_managed_profile_enabled" />
+
<!-- Allows applications to call into AccountAuthenticators.
<p>Not for use by third-party applications. -->
<permission android:name="android.permission.ACCOUNT_MANAGER"