1 files changed, 6 insertions, 6 deletions
diff --git a/sdksandbox/tests/hostsidetests/src/com/android/tests/sdksandbox/host/SdkSandboxLifecycleHostTest.java b/sdksandbox/tests/hostsidetests/src/com/android/tests/sdksandbox/host/SdkSandboxLifecycleHostTest.java
index c0587488ae..9b212959ce 100644
--- a/sdksandbox/tests/hostsidetests/src/com/android/tests/sdksandbox/host/SdkSandboxLifecycleHostTest.java
+++ b/sdksandbox/tests/hostsidetests/src/com/android/tests/sdksandbox/host/SdkSandboxLifecycleHostTest.java
@@ -73,12 +73,12 @@ public final class SdkSandboxLifecycleHostTest extends BaseHostJUnit4Test {
 
         mWasRoot = getDevice().isAdbRoot();
         getDevice().enableAdbRoot();
-
-        cleanUpAppAndSandboxProcesses();
     }
 
     @After
     public void tearDown() throws Exception {
+        cleanUpAppAndSandboxProcesses();
+
         if (!mWasRoot) {
             getDevice().disableAdbRoot();
         }
@@ -190,15 +190,15 @@ public final class SdkSandboxLifecycleHostTest extends BaseHostJUnit4Test {
     @Test
     public void testSandboxIsKilledWhenKillswitchEnabled() throws Exception {
         try {
-            getDevice().executeShellCommand(
-                    "device_config put sdk_sandbox disable_sdk_sandbox false");
+            getDevice()
+                    .executeShellCommand("device_config put adservices disable_sdk_sandbox false");
             startActivity(APP_PACKAGE, APP_ACTIVITY);
             String processDump = getDevice().executeAdbCommand("shell", "ps", "-A");
             assertThat(processDump).contains(APP_PACKAGE + '\n');
             assertThat(processDump).contains(SANDBOX_1_PROCESS_NAME);
 
-            getDevice().executeShellCommand(
-                    "device_config put sdk_sandbox disable_sdk_sandbox true");
+            getDevice()
+                    .executeShellCommand("device_config put adservices disable_sdk_sandbox true");
             waitForProcessDeath(SANDBOX_1_PROCESS_NAME);
 
             processDump = getDevice().executeAdbCommand("shell", "ps", "-A");