diff options
| author | 2024-11-25 19:33:26 +0000 | |
|---|---|---|
| committer | 2024-12-02 18:40:10 +0000 | |
| commit | 024ecceb21bfae323de7e5e2e70fe2c169e04b2a (patch) | |
| tree | 62843a2ac4e1a3dd0afb465fbaf2b2d7d7ced0e2 | |
| parent | 996b6b00d73beb8491899b1d81b59a40e4e1991a (diff) | |
Use an admin flag for the COPY_ACCOUNTS permission
This was added in ag/30578611 but was reverted due to a test failure.
This CL fixes the test failure
Bug: 381303924
Test: atest PermissionPolicyTest
Relnote: N/A
Flag: android.app.admin.flags.split_create_managed_profile_enabled
NO_IFTTT=flag jarjar logic already covered
LOW_COVERAGE_REASON=NON_CODE_ONLY
Change-Id: I6a0d4a096c47dae4cf89981554e2c87ba35a6a55
| -rw-r--r-- | PermissionController/jarjar-rules.txt | 4 | ||||
| -rw-r--r-- | PermissionController/res/xml/roles.xml | 8 | ||||
| -rw-r--r-- | PermissionController/role-controller/Android.bp | 1 | ||||
| -rw-r--r-- | service/jarjar-rules.txt | 4 |
4 files changed, 17 insertions, 0 deletions
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 |