Enable ActivitySecurity__asm_restrictions_enabled for CTS
CTS should work as expected even if the new ams restrictions flag is
enabled, current tests cover some of these restrictions already by
ensuring that caller app can start activites while the sandbox activity
is on top, and upcoming cls will cover other cases like using clearTop
flag.
Test: atest SdkSandboxManagerTest
Bug: 284139205
Change-Id: I78ab90a6f53e02ec018271299829f850c811379d
diff --git a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
index c27e2fa..be3eb11 100644
--- a/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
+++ b/sdksandbox/tests/cts/endtoendtests/src/com/android/tests/sdksandbox/endtoend/SdkSandboxManagerTest.java
@@ -54,6 +54,7 @@
import androidx.test.ext.junit.rules.ActivityScenarioRule;
import androidx.test.platform.app.InstrumentationRegistry;
+import com.android.compatibility.common.util.DeviceConfigStateHelper;
import com.android.ctssdkprovider.IActivityStarter;
import com.android.ctssdkprovider.ICtsSdkProviderApi;
import com.android.modules.utils.build.SdkLevel;
@@ -84,6 +85,10 @@
private static final String OPTION_THROW_INTERNAL_ERROR = "internal-error";
private static final String OPTION_THROW_REQUEST_SURFACE_PACKAGE_ERROR = "rsp-error";
+ private static final String NAMESPACE_WINDOW_MANAGER = "window_manager";
+ private static final String ASM_RESTRICTIONS_ENABLED =
+ "ActivitySecurity__asm_restrictions_enabled";
+
@Rule
public final ActivityScenarioRule<TestActivity> mRule =
new ActivityScenarioRule<>(TestActivity.class);
@@ -94,11 +99,15 @@
private SdkSandboxManager mSdkSandboxManager;
+ private final DeviceConfigStateHelper mDeviceConfig =
+ new DeviceConfigStateHelper(NAMESPACE_WINDOW_MANAGER);
+
@Before
public void setup() {
final Context context = InstrumentationRegistry.getInstrumentation().getContext();
mSdkSandboxManager = context.getSystemService(SdkSandboxManager.class);
mScenario = mRule.getScenario();
+ mDeviceConfig.set(ASM_RESTRICTIONS_ENABLED, "1");
}
@After
@@ -106,6 +115,7 @@
try {
mSdkSandboxManager.unloadSdk(SDK_NAME_1);
mSdkSandboxManager.unloadSdk(SDK_NAME_2);
+ mDeviceConfig.close();
} catch (Exception ignored) {
}
}
