diff options
| author | 2024-01-11 01:13:13 +0000 | |
|---|---|---|
| committer | 2024-01-11 01:13:13 +0000 | |
| commit | 7f2c8971caa320c99ebd896117ed60cd1bd16497 (patch) | |
| tree | ca083c8c2bcee9cd4a45ace585d5657a3917b3f5 | |
| parent | 08f196736ef253202dd5a75f4dd2c4b64b90bb88 (diff) | |
Fix jarjar rules for feature flags
This tightens up the jarjar rule that was added to avoid failures in
CtsStrictJavaPackagesTestCases due to duplicated flag classes. The
original rule was also causing the flag names themselves to be renamed,
resulting in incorrect (always false) values being returned.
Bug: 319515313
Test: atest CtsStrictJavaPackagesTestCases
Change-Id: I9147825fdbe3a392897587c7fadf17eb7736295a
| -rw-r--r-- | PermissionController/jarjar-rules.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index f4d8a0be2..4df97f4c0 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -1 +1,2 @@ -rule android.permission.flags.** com.android.permissioncontroller.jarjar.@0 +rule android.permission.flags.*Flags* com.android.permissioncontroller.jarjar.@0 +rule android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 |