Update UX CTS root test.
Test: atest
Bug: b/
Change-Id: I7f972c414354c3fcaa3f1609404ce118350891be
diff --git a/adservices/tests/cts/ui/gaux/alreadyenrolledchannel/src/com/android/adservices/tests/ui/gaux/alreadyenrolledchannel/GaUxAlreadyEnrolledChannelTest.java b/adservices/tests/cts/ui/gaux/alreadyenrolledchannel/src/com/android/adservices/tests/ui/gaux/alreadyenrolledchannel/GaUxAlreadyEnrolledChannelTest.java
index 1e21d0e..3273a58 100644
--- a/adservices/tests/cts/ui/gaux/alreadyenrolledchannel/src/com/android/adservices/tests/ui/gaux/alreadyenrolledchannel/GaUxAlreadyEnrolledChannelTest.java
+++ b/adservices/tests/cts/ui/gaux/alreadyenrolledchannel/src/com/android/adservices/tests/ui/gaux/alreadyenrolledchannel/GaUxAlreadyEnrolledChannelTest.java
@@ -59,6 +59,7 @@
Assume.assumeTrue(AdservicesTestHelper.isDeviceSupported());
UiUtils.enableNotificationPermission();
+ UiUtils.enableGa();
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
@@ -122,7 +123,6 @@
@Test
public void testGaRowAdIdEnabled() throws Exception {
UiUtils.setAsRowDevice();
- UiUtils.enableGa();
AdServicesStates adServicesStates =
new AdServicesStates.Builder()
@@ -151,7 +151,6 @@
@Test
public void testGaRowAdIdDisabled() throws Exception {
UiUtils.setAsRowDevice();
- UiUtils.enableGa();
AdServicesStates adServicesStates =
new AdServicesStates.Builder()
@@ -180,7 +179,6 @@
@Test
public void testGaEuAdIdEnabled() throws Exception {
UiUtils.setAsEuDevice();
- UiUtils.enableGa();
AdServicesStates adServicesStates =
new AdServicesStates.Builder()
@@ -207,7 +205,6 @@
@Test
public void testGaEuAdIdDisabled() throws Exception {
UiUtils.setAsEuDevice();
- UiUtils.enableGa();
AdServicesStates adServicesStates =
new AdServicesStates.Builder()
diff --git a/adservices/tests/cts/ui/gaux/graduationchannel/src/com/android/adservices/tests/ui/gaux/graduationchannel/GaUxGraduationChannelTest.java b/adservices/tests/cts/ui/gaux/graduationchannel/src/com/android/adservices/tests/ui/gaux/graduationchannel/GaUxGraduationChannelTest.java
index 68f6356..287e135 100644
--- a/adservices/tests/cts/ui/gaux/graduationchannel/src/com/android/adservices/tests/ui/gaux/graduationchannel/GaUxGraduationChannelTest.java
+++ b/adservices/tests/cts/ui/gaux/graduationchannel/src/com/android/adservices/tests/ui/gaux/graduationchannel/GaUxGraduationChannelTest.java
@@ -59,6 +59,7 @@
Assume.assumeTrue(AdservicesTestHelper.isDeviceSupported());
UiUtils.enableNotificationPermission();
+ UiUtils.enableGa();
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
@@ -123,7 +124,6 @@
public void testRowU18ToGaAdIdEnabled() throws Exception {
UiUtils.setAsRowDevice();
UiUtils.enableU18Ux();
- UiUtils.enableBeta();
AdServicesStates u18States =
new AdServicesStates.Builder()
