From cd8fef13a58c920ce33a138d360753c774f6956e Mon Sep 17 00:00:00 2001
From: Alex Johnston <acjohnston@google.com>
Date: Mon, 25 Nov 2024 19:33:26 +0000
Subject: Use an admin flag for the COPY_ACCOUNTS permission

Bug: 380793808
Test: atest PermissionPolicyTest
Relnote: N/A
Flag: android.app.admin.flags.split_create_managed_profile_enabled
NO_IFTTT=flag jarjar logic already covered

Change-Id: I52df63f0cdbe0b1f36768228cb605c4d3f701330
---
 PermissionController/jarjar-rules.txt           | 4 ++++
 PermissionController/res/xml/roles.xml          | 8 ++++++++
 PermissionController/role-controller/Android.bp | 1 +
 service/jarjar-rules.txt                        | 4 ++++
 4 files changed, 17 insertions(+)

diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt
index 05fe2a148..74303a439 100644
--- a/PermissionController/jarjar-rules.txt
+++ b/PermissionController/jarjar-rules.txt
@@ -2,6 +2,10 @@
 # RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit
 # message.
 # LINT.IfChange
+rule android.app.admin.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0
+rule android.app.admin.flags.Flags com.android.permissioncontroller.jarjar.@0
 rule android.app.appfunctions.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0
 rule android.app.appfunctions.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0
 rule android.app.appfunctions.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 13aea57b7..787e19e55 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.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
+            <permission name="android.permission.REMOVE_ACCOUNTS"
+                featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
         </permissions>
     </role>
 
@@ -1484,6 +1488,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.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
+            <permission name="android.permission.REMOVE_ACCOUNTS"
+                featureFlag="android.app.admin.flags.Flags.splitCreateManagedProfileEnabled" />
         </permissions>
     </role>
 
diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp
index 9eacf975f..9f217660a 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -37,6 +37,7 @@ java_library {
         "android.content.pm.flags-aconfig-java-export",
         "android.permission.flags-aconfig-java-export",
         "android.os.flags-aconfig-java-export",
+        "device_policy_aconfig_flags_java_export",
     ],
     apex_available: [
         "com.android.permission",
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt
index ef6971b11..d9833ca56 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -2,6 +2,10 @@
 # RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit
 # message.
 # LINT.IfChange
+rule android.app.admin.flags.*FeatureFlags* com.android.permission.jarjar.@0
+rule android.app.admin.flags.FeatureFlags* com.android.permission.jarjar.@0
+rule android.app.admin.flags.FeatureFlags com.android.permission.jarjar.@0
+rule android.app.admin.flags.Flags com.android.permission.jarjar.@0
 rule android.app.appfunctions.flags.*FeatureFlags* com.android.permission.jarjar.@0
 rule android.app.appfunctions.flags.FeatureFlags* com.android.permission.jarjar.@0
 rule android.app.appfunctions.flags.FeatureFlags com.android.permission.jarjar.@0
-- 
cgit v1.2.3-59-g8ed1b