Shouldn't verify COMP is possible in a device without managed_users feature
Also, removing the STOPSHIP comment which is no longer a thing.
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testIsManagedDeviceProvisioningAllowed
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.DeviceOwnerTest#testIsManagedProfileProvisioningAllowed_deviceOwnerIsSet
Change-Id: I83f228544bb77a3635cc0ba0bd85f18f6b7d9264
Fix: 64206410
(cherry picked from commit c7fecd2febe58c282673ebaace7997c0afa83e53)
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index ac846a3..dd648a7 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
@@ -492,9 +492,18 @@
// This case runs when DO is provisioned
// mHasFeature == true and provisioned, can't provision DO again.
executeDeviceTestMethod(".PreDeviceOwnerTest", "testIsProvisioningAllowedFalse");
- // Can provision Managed Profile when DO is on
- // STOPSHIP: Only allow creating a managed profile if allowed by the device owner.
- // b/31952368
+ }
+
+ /**
+ * Can provision Managed Profile when DO is set by default if they are the same admin.
+ */
+ public void testIsManagedProfileProvisioningAllowed_deviceOwnerIsSet() throws Exception {
+ if (!mHasFeature) {
+ return;
+ }
+ if (!hasDeviceFeature("android.software.managed_users")) {
+ return;
+ }
executeDeviceTestMethod(".PreDeviceOwnerTest",
"testIsProvisioningAllowedTrueForManagedProfileAction");
}