commit 76379f3813bdb3f515b84683ad52e72cb8098be8
author Sumedh Sen <sumedhsen@google.com> Fri Jun 23 18:35:48 2023 -0700
committer Sumedh Sen <sumedhsen@google.com> Fri Jun 23 18:35:48 2023 -0700
tree 8c03bd7fab10e4f624af5de5adfc574cdb436217
parent 88d6ad27372afc04ae5e930371a44fe6fc4bb5df

Skip test if device owner cant be set

Bug: 287246591
Test: atest CtsSuspendAppsTestCases:SuspendPackagesTest
Change-Id: I9836a7a257cecf1b92e8d35241794718c3538158

tests/suspendapps/tests/src/android/suspendapps/cts/SuspendPackagesTest.java

diff --git a/tests/suspendapps/tests/src/android/suspendapps/cts/SuspendPackagesTest.java b/tests/suspendapps/tests/src/android/suspendapps/cts/SuspendPackagesTest.java
index bec0a80..6efa5b9 100644
--- a/tests/suspendapps/tests/src/android/suspendapps/cts/SuspendPackagesTest.java
+++ b/tests/suspendapps/tests/src/android/suspendapps/cts/SuspendPackagesTest.java
@@ -86,9 +86,15 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    private void addAndAssertDeviceOwner() {
-        TestApis.devicePolicy().setDeviceOwner(new ComponentName(DEVICE_ADMIN_PACKAGE,
-                TestDeviceAdmin.class.getName()));
+    private boolean addDeviceOwner() {
+        try {
+            TestApis.devicePolicy().setDeviceOwner(new ComponentName(DEVICE_ADMIN_PACKAGE,
+                    TestDeviceAdmin.class.getName()));
+            return true;
+        } catch (Exception e) {
+            Log.e(TAG, "Could not add device owner", e);
+        }
+        return false;
     }
 
     private void addAndAssertDeviceAdmin() {
@@ -193,7 +199,7 @@
     @Test
     public void testCanSuspendWhenDeviceOwner() throws Exception {
         assumeTrue(FeatureUtil.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN));
-        addAndAssertDeviceOwner();
+        assumeTrue(addDeviceOwner());
         SuspendTestUtils.suspend(null, null, null);
     }