diff options
| author | 2024-12-02 23:35:16 +0000 | |
|---|---|---|
| committer | 2024-12-17 10:49:44 -0800 | |
| commit | 0b3022e555fdf158dbdcc5171e24e1c574e0a9fe (patch) | |
| tree | d8be93042bc667154b29249781e5f9db38fbd786 | |
| parent | 2b2fce169f161f2b139846c56d2fdb938941206c (diff) | |
Add READ/WRITE_SYSTEM_PREFERENCES permissions to ASSISTANT role
Bug: 381900860
Flag: com.android.settingslib.flags.settings_catalyst
Flag: com.android.settingslib.flags.write_system_preference_permission_enabled
Test: manual test via build + verifying permissions available on app
Relnote: N/A
NO_IFTTT=flag jarjar logic already covered
LOW_COVERAGE_REASON=NON_CODE_ONLY
Change-Id: I869ce060616ed4000ddf1b17a66d93fc6bb93429
| -rw-r--r-- | PermissionController/jarjar-rules.txt | 4 | ||||
| -rw-r--r-- | PermissionController/res/xml/roles.xml | 4 | ||||
| -rw-r--r-- | PermissionController/role-controller/Android.bp | 1 | ||||
| -rw-r--r-- | service/jarjar-rules.txt | 4 |
4 files changed, 13 insertions, 0 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index 74303a439..5ecb0241f 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -30,4 +30,8 @@ rule com.android.permission.flags.*FeatureFlags* com.android.permissioncontrolle rule com.android.permission.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 rule com.android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 +rule com.android.settingslib.flags.Flags com.android.permissioncontroller.jarjar.@0 # LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransform) diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 704925601..fb12ed0d0 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -155,9 +155,13 @@ minSdkVersion="35" optionalMinSdkVersion="34" /> <permission name="android.permission.EMBED_ANY_APP_IN_UNTRUSTED_MODE" minSdkVersion="35" /> + <permission name="android.permission.READ_SYSTEM_PREFERENCES" + featureFlag="com.android.settingslib.flags.Flags.settingsCatalyst" /> </permissions> <app-op-permissions> <app-op-permission name="android.permission.SYSTEM_ALERT_WINDOW" /> + <app-op-permission name="android.permission.WRITE_SYSTEM_PREFERENCES" + featureFlag="com.android.settingslib.flags.Flags.writeSystemPreferencePermissionEnabled" /> </app-op-permissions> </role> diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp index 9f217660a..f89fd140c 100644 --- a/PermissionController/role-controller/Android.bp +++ b/PermissionController/role-controller/Android.bp @@ -32,6 +32,7 @@ java_library { ], static_libs: [ "modules-utils-build_system", + "aconfig_settingslib_exported_flags_java_lib", "android.app.appfunctions.exported-flags-aconfig-java", "android.companion.virtualdevice.flags-aconfig-java-export", "android.content.pm.flags-aconfig-java-export", diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index d9833ca56..bad5c7666 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -42,6 +42,10 @@ rule com.android.safetycenter.annotations.** com.android.permission.jarjar.@0 rule com.android.safetycenter.internaldata.** com.android.permission.jarjar.@0 rule com.android.safetycenter.pendingintents.** com.android.permission.jarjar.@0 rule com.android.safetycenter.resources.** com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.*FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.FeatureFlags com.android.permission.jarjar.@0 +rule com.android.settingslib.flags.Flags com.android.permission.jarjar.@0 rule com.google.protobuf.** com.android.permission.jarjar.@0 rule kotlin.** com.android.permission.jarjar.@0 rule com.android.permissioncontroller.PermissionControllerStatsLog com.android.permission.jarjar.@0 |