diff options
| author | 2025-04-10 16:21:55 -0700 | |
|---|---|---|
| committer | 2025-04-10 16:21:55 -0700 | |
| commit | e144636772e214d156613381cf597861eb420a4b (patch) | |
| tree | a66393d1b4c67d622e18a014be6424f71021a8d3 /PermissionController | |
| parent | 29d0f9f930a0cc47e1740b67e75338a825f55415 (diff) | |
| parent | 453adc2a8275c5437c1c488bba51847590499800 (diff) | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/32899264', 'googleplex-android-review.googlesource.com/32978037'] into 25Q2-release.
Change-Id: I27fd5fe92e075c77e758a25de09f80e8670c404f
Diffstat (limited to 'PermissionController')
| -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 |
3 files changed, 0 insertions, 9 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index ceac6c3a7..7d6e56a70 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -34,8 +34,4 @@ 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 1339152d7..78017c32e 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -155,13 +155,9 @@ 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 f89fd140c..9f217660a 100644 --- a/PermissionController/role-controller/Android.bp +++ b/PermissionController/role-controller/Android.bp @@ -32,7 +32,6 @@ 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", |