Merge "Revert "Add flags check rule to permission timeline unit test"" into main

1 files changed, 3 insertions, 3 deletions

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 800123d43..e6a1c15c2 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,7 +24,6 @@ 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
@@ -58,7 +57,7 @@ import kotlinx.coroutines.test.runTest
 import org.junit.After
 import org.junit.Assume
 import org.junit.Before
-import org.junit.Rule
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
@@ -72,7 +71,6 @@ 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>
@@ -702,6 +700,7 @@ 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 =
@@ -846,6 +845,7 @@ class GetPermissionGroupUsageDetailsUseCaseTest {
     }
 
     @Test
+    @Ignore("b/365004787")
     @RequiresFlagsEnabled(Flags.FLAG_LOCATION_BYPASS_PRIVACY_DASHBOARD_ENABLED)
     fun emergencyAccessesAreNotClusteredWithRegularAccesses() = runTest {
         Assume.assumeTrue(SdkLevel.isAtLeastV())