Snap for 10853649 from 6f0c7c94dede1bb0da790c2f9801db8bbc331468 to udc-d2-release

Change-Id: I753e3460e2c2556b0a55b9c8c7c0081f5da29f77

3 files changed, 9 insertions, 0 deletions

diff --git a/adservices/tests/cts/adid/Android.bp b/adservices/tests/cts/adid/Android.bp
index dbcea88367..c0bb01c172 100644
--- a/adservices/tests/cts/adid/Android.bp
+++ b/adservices/tests/cts/adid/Android.bp
@@ -23,6 +23,7 @@ android_test {
     ],
     static_libs: [
         "adservices-clients",
+        "adservices-test-utility",
         "androidx.concurrent_concurrent-futures",
         "compatibility-device-util-axt",
         "truth-prebuilt",
@@ -42,3 +43,4 @@ android_test {
     test_mainline_modules: ["com.google.android.adservices.apex"],
     manifest: "AndroidManifest.xml",
 }
+
diff --git a/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java b/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java
index 241dc094ba..6578bdbbfb 100644
--- a/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java
+++ b/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java
@@ -30,10 +30,12 @@ import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.adservices.common.AdservicesTestHelper;
 import com.android.compatibility.common.util.ShellUtils;
 
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -55,6 +57,8 @@ public class AdIdManagerTest {
 
     @Before
     public void setup() throws Exception {
+        Assume.assumeTrue(AdservicesTestHelper.isDeviceSupported());
+
         overrideAdIdKillSwitch(true);
         overridePpapiAppAllowList();
         // Cool-off rate limiter in case it was initialized by another test
diff --git a/adservices/tests/cts/appsetid/src/com/android/adservices/tests/appsetid/AppSetIdManagerTest.java b/adservices/tests/cts/appsetid/src/com/android/adservices/tests/appsetid/AppSetIdManagerTest.java
index 17a1702e60..6381a608fb 100644
--- a/adservices/tests/cts/appsetid/src/com/android/adservices/tests/appsetid/AppSetIdManagerTest.java
+++ b/adservices/tests/cts/appsetid/src/com/android/adservices/tests/appsetid/AppSetIdManagerTest.java
@@ -31,6 +31,7 @@ import androidx.test.core.app.ApplicationProvider;
 import androidx.test.filters.FlakyTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.adservices.common.AdservicesTestHelper;
 import com.android.adservices.common.CompatAdServicesTestUtils;
 import com.android.compatibility.common.util.ConnectivityUtils;
 import com.android.compatibility.common.util.ShellUtils;
@@ -71,6 +72,8 @@ public class AppSetIdManagerTest {
 
     @Before
     public void setup() throws Exception {
+        // Skip the test if it runs on unsupported platforms
+        Assume.assumeTrue(AdservicesTestHelper.isDeviceSupported());
         overrideAppSetIdKillSwitch(true);
         // Cool-off rate limiter in case it was initialized by another test
         TimeUnit.SECONDS.sleep(1);