commit c276a190ff117642fe4022cb90130910eedd50e1
author Hongguang <hgchen@google.com> Fri Jun 24 12:26:23 2022 -0700
committer Jonathan Scott <scottjonathan@google.com> Thu Jun 30 08:43:44 2022 +0000
tree bfa5022dd664b3a6a296a662a99052b860dec48d
parent 9d17e04a70519b03ebf0ff40c694dcdfd18d2b4d

Use RequireFeature instead of RequiresFeature

Bug: 237097896
Test: android.devicepolicy.cts.DevicePolicyManagerTest#checkProvisioningPreCondition_actionDO_onNonSystemUser_returnsNotSystemUser

Change-Id: I8e7523554ba11fc6edf7a2f8c32c92a98ff72623

tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java

diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
index 11b5fd4..b1a5ca0 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
@@ -54,7 +54,6 @@
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
-import android.annotation.RequiresFeature;
 import android.app.AppOpsManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.FullyManagedDeviceProvisioningParams;
@@ -106,6 +105,7 @@
 import com.android.bedstead.nene.users.UserType;
 import com.android.bedstead.remotedpc.RemoteDpc;
 import com.android.bedstead.testapp.TestAppInstance;
+import com.android.compatibility.common.util.ApiTest;
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
 
@@ -1354,7 +1354,8 @@
     @RequireRunOnSecondaryUser
     @EnsureHasNoProfileOwner
     @RequireNotHeadlessSystemUserMode
-    @RequiresFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @ApiTest(apis = "android.app.admin.DevicePolicyManager#checkProvisioningPrecondition")
     public void checkProvisioningPreCondition_actionDO_onNonSystemUser_returnsNotSystemUser() {
         boolean setupComplete = TestApis.users().current().getSetupComplete();
         TestApis.users().current().setSetupComplete(false);