summaryrefslogtreecommitdiff
path: root/PermissionController/role-controller/java
diff options
context:
space:
mode:
author Yi-an Chen <theianchen@google.com> 2024-06-14 07:32:57 +0000
committer Yi-an Chen <theianchen@google.com> 2024-10-23 22:21:04 +0000
commit4e5889e2d0d1aab829ce72c0695a481fcb34657e (patch)
tree6f90e37563ccfc066d5e54c8a3de692fe9d6569d /PermissionController/role-controller/java
parent6a933fc3e88928f22cb7cd8cdd98217feaa69c71 (diff)
Clean up unused lib/rules in build file
These are not needed after the exported flag migration Bug: 313706381 Relnote: N/A Flag: EXEMPT code clean-up Test: m, presubmit, RoleParserTest and StrictJavaPackagesTest Change-Id: I672ff4d6c09fe68b90f9c153d9015165a34332b4
Diffstat (limited to 'PermissionController/role-controller/java')
-rw-r--r--PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
index 6d5cf69bd..a0705cd5e 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
@@ -1106,7 +1106,7 @@ public class RoleParser {
+ ">");
return fallbackValue;
}
- String className = applyJarjarTransform(value.substring(0, lastDotIndex));
+ String className = applyJarjarTransformIfNeeded(value.substring(0, lastDotIndex));
String methodName = value.substring(lastDotIndex + 1);
Method method;
try {
@@ -1155,18 +1155,16 @@ public class RoleParser {
};
}
- // LINT.IfChange(applyJarjarTransform)
+ // LINT.IfChange(applyJarjarTransformIfNeeded)
/**
* Simulate the jarjar transform that should happen on the class name.
* <p>
* Currently this only handles the {@code Flags} classes for feature flagging.
*/
@NonNull
- private String applyJarjarTransform(@NonNull String className) {
- if (className.endsWith(".Flags")) {
- String jarjarPrefix = Objects.equals(mContext.getPackageName(), "android")
- ? "com.android.permission.jarjar." : "com.android.permissioncontroller.jarjar.";
- return jarjarPrefix + className;
+ private String applyJarjarTransformIfNeeded(@NonNull String className) {
+ if (className.endsWith(".Flags") && Objects.equals(mContext.getPackageName(), "android")) {
+ return "com.android.permission.jarjar." + className;
}
return className;
}