commit 7f059a30c2acc6dd953074b45bcfdca1c1246833
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jan 03 19:38:37 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 03 19:38:38 2017 +0000
tree 8273f47375b881018213c4640a11601d2773834d
parent bc83c04996cb2eb946926096f717297091d5b8b2
parent 6c961d51772fec5a99f1c99cda15a3e52c9b1828

Merge "Partial revert of change 10737163eb75062f7ec42c45d526f4d5cad60678"

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

diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index 9832e09..a6e8e5f 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.devicepolicy;
 
+import android.platform.test.annotations.RequiresDevice;
+
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
@@ -204,6 +206,7 @@
         executeDeviceTestMethod(".PermissionsTest", "testPermissionGrantState");
     }
 
+    @RequiresDevice
     public void testAlwaysOnVpn() throws Exception {
         if (!mHasFeature) {
             return;
@@ -212,6 +215,7 @@
         executeDeviceTestClass(".AlwaysOnVpnTest");
     }
 
+    @RequiresDevice
     public void testAlwaysOnVpnLockDown() throws Exception {
         if (!mHasFeature) {
             return;
@@ -227,6 +231,7 @@
         }
     }
 
+    @RequiresDevice
     public void testAlwaysOnVpnPackageUninstalled() throws Exception {
         if (!mHasFeature) {
             return;