commit 2114d71af5c21366516c011ab8c983d44929ce12
author Priyanka Advani <padvani@google.com> Wed Jan 17 17:16:42 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 17 17:16:42 2024 +0000
tree a122d6f87c9d01df1f490472029fb7d22ecdb7d0
parent 1c3bc59ebb9dee0cc95b5e8d54a4ce2823c6858f

Revert "Avoid race condition when setting the killswitch in unit tests"

This reverts commit 1c3bc59ebb9dee0cc95b5e8d54a4ce2823c6858f.

Reason for revert: Possible culprit for b/320655726. Will be conforming through ABTD before submitting the revert.

Change-Id: Ic68a4230b3716f4aea0779f348320b41b1e535ea

sdksandbox/tests/unittest/src/com/android/server/sdksandbox/SdkSandboxManagerServiceUnitTest.java

diff --git a/sdksandbox/tests/unittest/src/com/android/server/sdksandbox/SdkSandboxManagerServiceUnitTest.java b/sdksandbox/tests/unittest/src/com/android/server/sdksandbox/SdkSandboxManagerServiceUnitTest.java
index 9b81dd8..6d4b7ce 100644
--- a/sdksandbox/tests/unittest/src/com/android/server/sdksandbox/SdkSandboxManagerServiceUnitTest.java
+++ b/sdksandbox/tests/unittest/src/com/android/server/sdksandbox/SdkSandboxManagerServiceUnitTest.java
@@ -260,12 +260,12 @@
                                 sSdkSandboxPulledAtoms));
 
         mService = new SdkSandboxManagerService(mSpyContext, mInjector);
+        mService.forceEnableSandbox();
         sSdkSandboxManagerLocal = mService.getLocalManager();
         assertThat(sSdkSandboxManagerLocal).isNotNull();
 
         sSdkSandboxSettingsListener = mService.getSdkSandboxSettingsListener();
         assertThat(sSdkSandboxSettingsListener).isNotNull();
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "false");
 
         mClientAppUid = Process.myUid();
         mSandboxLatencyInfo = new SandboxLatencyInfo();
@@ -2436,7 +2436,7 @@
 
     @Test
     public void testIsDisabled() {
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "false");
+        mService.forceEnableSandbox();
         assertThat(mService.isSdkSandboxDisabled()).isFalse();
     }
 
@@ -2445,13 +2445,13 @@
         // SDK sandbox is enabled for an emulator, even if the killswitch is turned on provided
         // AdServices APK is present.
         Mockito.when(mInjector.isEmulator()).thenReturn(true);
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "true");
+        sSdkSandboxSettingsListener.setKillSwitchState(true);
         assertThat(mService.isSdkSandboxDisabled()).isFalse();
 
         // SDK sandbox is disabled when the killswitch is enabled if the device is not an emulator.
         mService.clearSdkSandboxState();
         Mockito.when(mInjector.isEmulator()).thenReturn(false);
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "true");
+        sSdkSandboxSettingsListener.setKillSwitchState(true);
         assertThat(mService.isSdkSandboxDisabled()).isTrue();
     }
 
@@ -2460,18 +2460,18 @@
         // SDK sandbox is disabled for an emulator, if AdServices APK is not present.
         Mockito.doReturn(false).when(mInjector).isAdServiceApkPresent();
         Mockito.when(mInjector.isEmulator()).thenReturn(true);
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "true");
+        sSdkSandboxSettingsListener.setKillSwitchState(true);
         assertThat(mService.isSdkSandboxDisabled()).isTrue();
     }
 
     @Test
     public void testSdkSandboxDisabledForAdServiceApkMissing() {
         Mockito.doReturn(true).when(mInjector).isAdServiceApkPresent();
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "false");
+        sSdkSandboxSettingsListener.setKillSwitchState(false);
         assertThat(mService.isSdkSandboxDisabled()).isFalse();
 
         Mockito.doReturn(false).when(mInjector).isAdServiceApkPresent();
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "false");
+        sSdkSandboxSettingsListener.setKillSwitchState(false);
         assertThat(mService.isSdkSandboxDisabled()).isTrue();
     }
 
@@ -2479,6 +2479,7 @@
     public void testKillswitchStopsSandbox() throws Exception {
         disableKillUid();
         setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "false");
+        sSdkSandboxSettingsListener.setKillSwitchState(false);
         loadSdk(SDK_NAME);
         setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "true");
         int callingUid = Binder.getCallingUid();
@@ -2491,7 +2492,7 @@
         disableNetworkPermissionChecks();
         disableForegroundCheck();
 
-        setDeviceConfigProperty(PROPERTY_DISABLE_SANDBOX, "true");
+        sSdkSandboxSettingsListener.setKillSwitchState(true);
         FakeLoadSdkCallbackBinder callback = new FakeLoadSdkCallbackBinder();
         mService.loadSdk(
                 TEST_PACKAGE,