1 files changed, 24 insertions, 1 deletions
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 f86e380a59..8b74ac3c8a 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
@@ -23,7 +23,11 @@ import android.os.OutcomeReceiver;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.ShellUtils;
+
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -36,6 +40,25 @@ public class AdIdManagerTest {
     private static final Executor CALLBACK_EXECUTOR = Executors.newCachedThreadPool();
     private static final Context sContext = ApplicationProvider.getApplicationContext();
 
+    @Before
+    public void setup() {
+        overrideAdIdKillSwitch(true);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        overrideAdIdKillSwitch(false);
+    }
+
+    // Override adid related kill switch to ignore the effect of actual PH values.
+    // If shouldOverride = true, override adid related kill switch to OFF to allow adservices
+    // If shouldOverride = false, override adid related kill switch to meaningless value so that
+    // PhFlags will use the default value.
+    private void overrideAdIdKillSwitch(boolean shouldOverride) {
+        String overrideString = shouldOverride ? "false" : "null";
+        ShellUtils.runShellCommand("setprop debug.adservices.adid_kill_switch " + overrideString);
+    }
+
     @Test
     public void testAdIdManager() throws Exception {
         AdIdManager adIdManager = sContext.getSystemService(AdIdManager.class);
@@ -55,6 +78,6 @@ public class AdIdManagerTest {
         adIdManager.getAdId(CALLBACK_EXECUTOR, callback);
         AdId resultAdId = future.get();
         Assert.assertNotNull(resultAdId.getAdId());
-        Assert.assertEquals(false, resultAdId.isLimitAdTrackingEnabled());
+        Assert.assertNotNull(resultAdId.isLimitAdTrackingEnabled());
     }
 }