diff options
8 files changed, 12 insertions, 51 deletions
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp index 596b2dbb5..5c238806e 100644 --- a/PermissionController/Android.bp +++ b/PermissionController/Android.bp @@ -72,11 +72,6 @@ java_library { ], } -filegroup { - name: "PermissionController-jarjar-rules", - srcs: ["jarjar-rules.txt"], -} - android_library { name: "PermissionController-lib", sdk_version: "system_current", @@ -172,9 +167,6 @@ android_library { "//apex_available:platform", "com.android.permission", ], - - // TODO(b/313706381): Remove jarjar once flagging lib is fixed - jarjar_rules: ":PermissionController-jarjar-rules", } android_app { diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt deleted file mode 100644 index 7bfda1ab1..000000000 --- a/PermissionController/jarjar-rules.txt +++ /dev/null @@ -1,25 +0,0 @@ -# You may bypass this Gerrit IfThisThenThat Lint if your change doesn't affect -# RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit -# message. -# LINT.IfChange -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 -rule android.app.appfunctions.flags.Flags com.android.permissioncontroller.jarjar.@0 -rule android.companion.virtualdevice.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.companion.virtualdevice.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.companion.virtualdevice.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 -rule android.companion.virtualdevice.flags.Flags com.android.permissioncontroller.jarjar.@0 -rule android.content.pm.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.content.pm.FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.content.pm.FeatureFlags com.android.permissioncontroller.jarjar.@0 -rule android.content.pm.Flags com.android.permissioncontroller.jarjar.@0 -rule android.permission.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.permission.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.permission.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 -rule android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 -rule android.os.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.os.FeatureFlags* com.android.permissioncontroller.jarjar.@0 -rule android.os.FeatureFlags com.android.permissioncontroller.jarjar.@0 -rule android.os.Flags com.android.permissioncontroller.jarjar.@0 -# LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransform) 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; } diff --git a/PermissionController/tests/mocking/Android.bp b/PermissionController/tests/mocking/Android.bp index 37851b2bb..a541f4577 100644 --- a/PermissionController/tests/mocking/Android.bp +++ b/PermissionController/tests/mocking/Android.bp @@ -86,7 +86,4 @@ android_test { ], kotlincflags: ["-Xjvm-default=all"], - - // TODO(b/313706381): Remove jarjar once flagging lib is fixed - jarjar_rules: ":PermissionController-jarjar-rules", } diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt index e6a1c15c2..800123d43 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/domain/usecase/GetPermissionGroupUsageDetailsUseCaseTest.kt @@ -24,6 +24,7 @@ import android.content.pm.PackageManager import android.os.UserHandle import android.permission.flags.Flags import android.platform.test.annotations.RequiresFlagsEnabled +import android.platform.test.flag.junit.DeviceFlagsValueProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.dx.mockito.inline.extended.ExtendedMockito import com.android.modules.utils.build.SdkLevel @@ -57,7 +58,7 @@ import kotlinx.coroutines.test.runTest import org.junit.After import org.junit.Assume import org.junit.Before -import org.junit.Ignore +import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock @@ -71,6 +72,7 @@ import org.mockito.quality.Strictness class GetPermissionGroupUsageDetailsUseCaseTest { @Mock private lateinit var application: PermissionControllerApplication @Mock private lateinit var context: Context + @JvmField @Rule val checkFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule() private var mockitoSession: MockitoSession? = null private lateinit var packageInfos: MutableMap<String, PackageInfoModel> @@ -700,7 +702,6 @@ class GetPermissionGroupUsageDetailsUseCaseTest { @RequiresFlagsEnabled( com.android.permission.flags.Flags.FLAG_PERMISSION_TIMELINE_ATTRIBUTION_LABEL_FIX ) - @Ignore("b/365004787") fun verifyAccessIsNotGroupedByAttributionLabelAndClustered() = runTest { // The package is not a location provider. val appOpEvents = @@ -845,7 +846,6 @@ class GetPermissionGroupUsageDetailsUseCaseTest { } @Test - @Ignore("b/365004787") @RequiresFlagsEnabled(Flags.FLAG_LOCATION_BYPASS_PRIVACY_DASHBOARD_ENABLED) fun emergencyAccessesAreNotClusteredWithRegularAccesses() = runTest { Assume.assumeTrue(SdkLevel.isAtLeastV()) diff --git a/flags/flags.aconfig b/flags/flags.aconfig index 924078897..4cb084988 100644 --- a/flags/flags.aconfig +++ b/flags/flags.aconfig @@ -104,7 +104,7 @@ flag { name: "app_permission_fragment_uses_preferences" is_exported: true namespace: "permissions" - description: "This flag enables AppPermissionFragment rather than LegacyAppPermissionFragment (to support BC25)" + description: "This flag enables AppPermissionFragment rather than LegacyAppPermissionFragment" bug: "349675008" is_fixed_read_only: true } @@ -131,7 +131,7 @@ flag { name: "wear_compose_material3" is_exported: true namespace: "permissions" - description: "This flag enables material3 design system for wear ui components (to support BC25)" + description: "This flag enables material3 design system for wear ui components" bug: "370489422" is_fixed_read_only: true } diff --git a/service/Android.bp b/service/Android.bp index 6f851c4d2..8efce5ebe 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -111,7 +111,6 @@ java_sdk_library { "service-permission-statsd", "permissioncontroller-statsd", "service-permission-proto-stream", - "com.android.permission.flags-aconfig-java", ], errorprone: { javacflags: ["-Xep:GuardedBy:ERROR"], diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 4d4d6e050..77e071672 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -1,5 +1,5 @@ # You may bypass this Gerrit IfThisThenThat Lint if your change doesn't affect -# RoleParser.applyJarjarTransform(), by adding NO_IFTTT=reason to your commit +# RoleParser.applyJarjarTransformIfNeeded(), by adding NO_IFTTT=reason to your commit # message. # LINT.IfChange rule android.app.appfunctions.flags.*FeatureFlags* com.android.permission.jarjar.@0 @@ -37,4 +37,4 @@ rule com.android.safetycenter.resources.** 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 -# LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransform) +# LINT.ThenChange(PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java:applyJarjarTransformIfNeeded) |