Revert "Use an admin flag for the COPY_ACCOUNTS permission"

Revert submission 30578537-admin-flag-export

Reason for revert: Likely culprit for b/381215589  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:30578537-admin-flag-export

Change-Id: I2dab6615dbb3ee37d06d9419f904d182b9e7086b

4 files changed, 0 insertions, 17 deletions

diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt
index 74303a439..05fe2a148 100644
--- a/PermissionController/jarjar-rules.txt
+++ b/PermissionController/jarjar-rules.txt
@@ -2,10 +2,6 @@
 # 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 787e19e55..13aea57b7 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -720,10 +720,6 @@
                 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>
 
@@ -1488,10 +1484,6 @@
             <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 9f217660a..9eacf975f 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -37,7 +37,6 @@ 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 d9833ca56..ef6971b11 100644
--- a/service/jarjar-rules.txt
+++ b/service/jarjar-rules.txt
@@ -2,10 +2,6 @@
 # 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