Merge "Snap for 9204358 from 473da7a6c321d207ea740a97424967fe69670313 to gki13-boot-release" into gki13-boot-releasegki13-boot-release

3 files changed, 18 insertions, 0 deletions

diff --git a/tests/tests/keystore/Android.bp b/tests/tests/keystore/Android.bp
index cfa2666d22f..8f7306cc8b2 100644
--- a/tests/tests/keystore/Android.bp
+++ b/tests/tests/keystore/Android.bp
@@ -62,6 +62,7 @@ android_test {
     ],
     static_libs: [
         "DeviceAdminApp",
+        "Harrier",
         "Nene",
         "androidx.test.rules",
         "compatibility-device-util-axt",
diff --git a/tests/tests/keystore/src/android/keystore/cts/DeviceOwnerKeyManagementTest.java b/tests/tests/keystore/src/android/keystore/cts/DeviceOwnerKeyManagementTest.java
index 123004afb3c..854f4110d62 100644
--- a/tests/tests/keystore/src/android/keystore/cts/DeviceOwnerKeyManagementTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/DeviceOwnerKeyManagementTest.java
@@ -36,11 +36,15 @@ import android.security.keystore.StrongBoxUnavailableException;
 import android.telephony.TelephonyManager;
 
 import com.android.bedstead.deviceadminapp.DeviceAdminApp;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.RequireRunOnSystemUser;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.devicepolicy.DeviceOwner;
 import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.compatibility.common.util.ApiTest;
 
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 
 import java.security.GeneralSecurityException;
@@ -61,6 +65,9 @@ public class DeviceOwnerKeyManagementTest {
     private static final ComponentName DEVICE_ADMIN_COMPONENT_NAME =
             DeviceAdminApp.deviceAdminComponentName(sContext);
 
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
     private static class SupportedKeyAlgorithm {
         public final String keyAlgorithm;
         public final String signatureAlgorithm;
@@ -333,6 +340,7 @@ public class DeviceOwnerKeyManagementTest {
             "android.app.admin.DevicePolicyManager#ID_TYPE_IMEI",
             "android.app.admin.DevicePolicyManager#ID_TYPE_MEID",
             "android.app.admin.DevicePolicyManager#ID_TYPE_SERIAL"})
+    @RequireRunOnSystemUser
     @Test
     public void testAllVariationsOfDeviceIdAttestation() throws Exception {
         try (DeviceOwner o = TestApis.devicePolicy().setDeviceOwner(DEVICE_ADMIN_COMPONENT_NAME)) {
@@ -344,6 +352,7 @@ public class DeviceOwnerKeyManagementTest {
             "android.app.admin.DevicePolicyManager#ID_TYPE_IMEI",
             "android.app.admin.DevicePolicyManager#ID_TYPE_MEID",
             "android.app.admin.DevicePolicyManager#ID_TYPE_SERIAL"})
+    @RequireRunOnSystemUser
     @Test
     public void testAllVariationsOfDeviceIdAttestationUsingStrongBox() throws Exception {
         try (DeviceOwner o = TestApis.devicePolicy().setDeviceOwner(DEVICE_ADMIN_COMPONENT_NAME)) {
diff --git a/tests/tests/mediastress/AndroidTest.xml b/tests/tests/mediastress/AndroidTest.xml
index c6ed5263bc0..215d9271fb0 100644
--- a/tests/tests/mediastress/AndroidTest.xml
+++ b/tests/tests/mediastress/AndroidTest.xml
@@ -19,6 +19,14 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+        <option name="force-skip-system-props" value="true" /> <!-- avoid restarting device -->
+        <option name="set-test-harness" value="false" />
+        <option name="screen-always-on" value="on" />
+        <option name="screen-adaptive-brightness" value="off" />
+        <option name="disable-audio" value="false"/>
+        <option name="screen-saver" value="off"/>
+    </target_preparer>
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
         <option name="target" value="host" />
         <option name="config-filename" value="cts" />