Use annotation for flag checking It seems like implementation of flag checking methods that were used previously depends on Android framework classes that aren't available on the host side, leading to NoSuchMethodError. Bug: 434278289 Flag: TEST_ONLY Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.ManagedProfileCrossProfileTest Change-Id: I0750cf1e403f645332b9fe203318f40352b84e5d
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileCrossProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileCrossProfileTest.java index 6cc3d5d..859f59e 100644 --- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileCrossProfileTest.java +++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileCrossProfileTest.java
@@ -22,6 +22,7 @@ import android.app.admin.flags.Flags; import android.platform.test.annotations.FlakyTest; +import android.platform.test.annotations.RequiresFlagsEnabled; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.log.LogUtil; @@ -173,11 +174,8 @@ @FlakyTest @Test + @RequiresFlagsEnabled(Flags.FLAG_CROSS_PROFILE_WIDGET_PROVIDER_BULK_APIS) public void testCrossProfileWidgetsSet() throws Exception { - if (!Flags.crossProfileWidgetProviderBulkApis()) { - return; - } - try { runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest", "testCrossProfileWidgetProviderSet", mProfileUserId); @@ -190,11 +188,8 @@ @FlakyTest @Test + @RequiresFlagsEnabled(Flags.FLAG_CROSS_PROFILE_WIDGET_PROVIDER_BULK_APIS) public void testCrossProfileWidgetsSetThenAdd() throws Exception { - if (!Flags.crossProfileWidgetProviderBulkApis()) { - return; - } - try { runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest", "testCrossProfileWidgetProviderSetThenAdd", mProfileUserId); @@ -207,11 +202,8 @@ @FlakyTest @Test + @RequiresFlagsEnabled(Flags.FLAG_CROSS_PROFILE_WIDGET_PROVIDER_BULK_APIS) public void testCrossProfileWidgetsSetThenRemove() throws Exception { - if (!Flags.crossProfileWidgetProviderBulkApis()) { - return; - } - try { runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest", "testCrossProfileWidgetProviderSetThenRemove", mProfileUserId); @@ -224,10 +216,8 @@ @FlakyTest @Test + @RequiresFlagsEnabled(Flags.FLAG_CROSS_PROFILE_WIDGET_PROVIDER_BULK_APIS) public void testCrossProfileWidgetsAddThenSet() throws Exception { - if (!Flags.crossProfileWidgetProviderBulkApis()) { - return; - } try { runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileWidgetTest",