1 files changed, 1 insertions, 16 deletions
diff --git a/adservices/tests/cts/src/android/adservices/cts/CustomAudienceApiCtsTest.java b/adservices/tests/cts/src/android/adservices/cts/CustomAudienceApiCtsTest.java
index 09cddae1b8..23714139a4 100644
--- a/adservices/tests/cts/src/android/adservices/cts/CustomAudienceApiCtsTest.java
+++ b/adservices/tests/cts/src/android/adservices/cts/CustomAudienceApiCtsTest.java
@@ -41,7 +41,6 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import com.android.adservices.service.PhFlagsFixture;
 import com.android.adservices.service.devapi.DevContext;
 import com.android.adservices.service.devapi.DevContextFilter;
-import com.android.compatibility.common.util.ShellUtils;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.util.concurrent.ListenableFuture;
@@ -83,20 +82,10 @@ public class CustomAudienceApiCtsTest extends ForegroundCtsTest {
         DevContext devContext = DevContextFilter.create(sContext).createDevContext(Process.myUid());
         mIsDebugMode = devContext.getDevOptionsEnabled();
 
+        // Needed to test different custom audience limits
         InstrumentationRegistry.getInstrumentation()
                 .getUiAutomation()
                 .adoptShellPermissionIdentity(Manifest.permission.WRITE_DEVICE_CONFIG);
-        // Override rate limiting throttle on API calls
-        PhFlagsFixture.overrideSdkRequestPermitsPerSecond(Integer.MAX_VALUE);
-        // Disable the enrollment check, by default
-        PhFlagsFixture.overrideFledgeEnrollmentCheck(false);
-        // We need to turn the Consent Manager into debug mode
-        overrideConsentManagerDebugMode();
-    }
-
-    // Override the Consent Manager behaviour - Consent Given
-    private void overrideConsentManagerDebugMode() {
-        ShellUtils.runShellCommand("setprop debug.adservices.consent_manager_debug_mode true");
     }
 
     @Test
@@ -110,8 +99,6 @@ public class CustomAudienceApiCtsTest extends ForegroundCtsTest {
 
     @Test
     public void testJoinCustomAudience_withMissingEnrollment_fail() {
-        PhFlagsFixture.overrideFledgeEnrollmentCheck(true);
-
         Exception exception =
                 assertThrows(
                         ExecutionException.class,
@@ -321,8 +308,6 @@ public class CustomAudienceApiCtsTest extends ForegroundCtsTest {
 
     @Test
     public void testLeaveCustomAudience_withMissingEnrollment_fail() {
-        PhFlagsFixture.overrideFledgeEnrollmentCheck(true);
-
         Exception exception =
                 assertThrows(
                         ExecutionException.class,