Merge "Don't run the VPN tests on watches." into android13-tests-dev

Author: Treehugger Robot

hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java

@@ -246,6 +246,7 @@ public void testSensorsRelatedPermissionsNotGrantedViaPolicy() throws Exception
     @RequiresDevice
     @Test
     public void testAlwaysOnVpn() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         installAppAsUser(VPN_APP_APK, userId);
         executeDeviceTestClassNoRestrictBackground(".AlwaysOnVpnTest", userId);
@@ -258,6 +259,7 @@ protected int getUserIdForAlwaysOnVpnTests() {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnLockDown() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         installAppAsUser(VPN_APP_APK, userId);
         try {
@@ -272,6 +274,7 @@ public void testAlwaysOnVpnLockDown() throws Exception {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnAcrossReboot() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         try {
             installAppAsUser(VPN_APP_APK, userId);
@@ -291,6 +294,7 @@ public void testAlwaysOnVpnAcrossReboot() throws Exception {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnPackageUninstalled() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         installAppAsUser(VPN_APP_APK, userId);
         try {
@@ -308,6 +312,7 @@ public void testAlwaysOnVpnPackageUninstalled() throws Exception {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnUnsupportedPackage() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         try {
             // Target SDK = 23: unsupported
@@ -333,6 +338,7 @@ public void testAlwaysOnVpnUnsupportedPackage() throws Exception {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnUnsupportedPackageReplaced() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         try {
             // Target SDK = 24: supported
@@ -355,6 +361,7 @@ public void testAlwaysOnVpnUnsupportedPackageReplaced() throws Exception {
     @RequiresDevice
     @Test
     public void testAlwaysOnVpnPackageLogged() throws Exception {
+        assumeIsNotWatch();
         int userId = getUserIdForAlwaysOnVpnTests();
         // Will be uninstalled in tearDown().
         installAppAsUser(VPN_APP_APK, userId);
@@ -675,7 +682,7 @@ private void setDefaultContentCaptureServiceEnabled(boolean enabled)
     @Test
     public void testSetMeteredDataDisabledPackages() throws Exception {
         assumeHasWifiFeature();
-        assumeFalse("is watch", hasDeviceFeature("android.hardware.type.watch"));
+        assumeIsNotWatch();
 
         installAppAsUser(METERED_DATA_APP_APK, mUserId);
 
@@ -1712,4 +1719,8 @@ private void restoreRestrictBackgroundPolicyTo(boolean restricted) throws Except
         getDevice().executeShellCommand(
                 restricted ? RESTRICT_BACKGROUND_ON_CMD : RESTRICT_BACKGROUND_OFF_CMD);
     }
+
+    private void assumeIsNotWatch() throws Exception {
+        assumeFalse("is watch", hasDeviceFeature("android.hardware.type.watch"));
+    }
 }