From e5bb5bd84ca40bbbe0e264b86ef15e12d996728f Mon Sep 17 00:00:00 2001 From: Anna Zhuravleva Date: Thu, 17 Aug 2023 15:04:01 +0000 Subject: Switch permission device tests to androidx flaky annotation. Platform_testing flaky annotation is for host side tests, device tests should use androidx annotation. Bug: 293837621 Test: presubmit Change-Id: If9f521ede3d9ecb065ede03554f9959e88a27ab7 --- PermissionController/TEST_MAPPING | 16 +++++----------- .../android/permissioncontroller/permission/TEST_MAPPING | 4 ++-- .../permissioncontroller/permission/service/TEST_MAPPING | 8 ++++---- .../permissioncontroller/permission/ui/TEST_MAPPING | 4 ++-- .../permissioncontroller/privacysources/TEST_MAPPING | 3 --- .../com/android/permissioncontroller/role/TEST_MAPPING | 4 ++-- .../permissioncontroller/safetylabel/TEST_MAPPING | 4 ++-- SafetyCenter/Config/TEST_MAPPING | 2 +- TEST_MAPPING | 4 ++-- framework-s/java/android/app/role/TEST_MAPPING | 4 ++-- service/java/com/android/role/TEST_MAPPING | 6 ------ .../permission/cts/AccessibilityPrivacySourceTest.kt | 2 +- .../android/permission/cts/LocationAccessCheckTest.java | 2 +- .../permission/cts/NotificationListenerCheckTest.java | 2 +- .../android/permission/cts/OneTimePermissionTest.java | 2 +- .../android/permission/cts/SharedUidPermissionsTest.java | 2 +- .../src/android/permission/cts/SplitPermissionTest.java | 2 +- .../permissionpolicy/cts/RestrictedPermissionsTest.java | 2 +- tests/cts/permissionui/TEST_MAPPING | 4 ++-- .../permissionui/cts/AppDataSharingUpdatesTest.kt | 2 +- .../src/android/permissionui/cts/AppPermissionTest.kt | 2 +- .../cts/CameraMicIndicatorsPermissionTest.kt | 2 +- .../src/android/permissionui/cts/LocationAccuracyTest.kt | 2 +- .../cts/LocationProviderInterceptDialogTest.kt | 2 +- .../src/android/permissionui/cts/MediaPermissionTest.kt | 2 +- .../permissionui/cts/MediaPermissionUpgradeTest.kt | 2 +- .../permissionui/cts/MultiDevicePermissionTest.kt | 2 +- .../src/android/permissionui/cts/NoPermissionTest.kt | 2 +- .../permissionui/cts/NotificationPermissionTest.kt | 2 +- .../android/permissionui/cts/PermissionDecisionsTest.kt | 2 +- .../src/android/permissionui/cts/PermissionGroupTest.kt | 2 +- .../android/permissionui/cts/PermissionPolicyTest25.kt | 4 ++-- .../cts/PermissionRationalePermissionGrantDialogTest.kt | 2 +- .../android/permissionui/cts/PermissionRationaleTest.kt | 2 +- .../permissionui/cts/PermissionReviewTapjackingTest.kt | 2 +- .../src/android/permissionui/cts/PermissionReviewTest.kt | 2 +- .../src/android/permissionui/cts/PermissionSplitTest.kt | 2 +- .../android/permissionui/cts/PermissionTapjackingTest.kt | 2 +- .../src/android/permissionui/cts/PermissionTest22.kt | 2 +- .../src/android/permissionui/cts/PermissionTest23.kt | 2 +- .../src/android/permissionui/cts/PermissionTest29.kt | 2 +- .../src/android/permissionui/cts/PermissionTest30.kt | 2 +- .../permissionui/cts/PermissionTest30WithBluetooth.kt | 2 +- .../android/permissionui/cts/PermissionUpgradeTest.kt | 2 +- .../android/permissionui/cts/PermissionUsageInfoTest.kt | 2 +- .../permissionui/cts/PhotoPickerPermissionTest.kt | 2 +- .../permissionui/cts/ReviewAccessibilityServicesTest.kt | 2 +- .../permissionui/cts/SafetyLabelChangesJobServiceTest.kt | 2 +- .../src/android/permissionui/cts/SafetyProtectionTest.kt | 2 +- .../android/permissionui/cts/SensorBlockedBannerTest.kt | 2 +- tests/cts/role/TEST_MAPPING | 4 ++-- .../role/src/android/app/role/cts/RoleManagerTest.java | 2 +- tests/cts/safetycenter/TEST_MAPPING | 2 +- .../safetycenter/safetycenteractivity/TEST_MAPPING | 2 +- tests/functional/safetycenter/singleuser/TEST_MAPPING | 2 +- tests/functional/safetycenter/subpages/TEST_MAPPING | 2 +- 56 files changed, 70 insertions(+), 85 deletions(-) diff --git a/PermissionController/TEST_MAPPING b/PermissionController/TEST_MAPPING index 869bb2020..a7f2aec54 100644 --- a/PermissionController/TEST_MAPPING +++ b/PermissionController/TEST_MAPPING @@ -8,9 +8,6 @@ "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ], "file_patterns": ["res/xml/roles\\.xml"] @@ -19,7 +16,7 @@ "name": "PermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -29,7 +26,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -46,10 +43,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ], "file_patterns": ["res/xml/roles\\.xml"] @@ -58,7 +52,7 @@ "name": "PermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, // TODO(b/238773220): These tests currently fails on R base image { @@ -82,7 +76,7 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING index fa3b7ef78..38d46fe76 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/TEST_MAPPING @@ -22,7 +22,7 @@ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, @@ -58,7 +58,7 @@ "include-filter": "android.permission.cts.PlatformPermissionGroupMappingTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] }, diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING index b71a85187..5dea9615a 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/service/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.PermissionControllerTest" @@ -18,7 +18,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permissionui.cts.SafetyLabelChangesJobServiceTest" @@ -29,7 +29,7 @@ "name": "CtsPermissionTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" }, { "include-filter": "android.permission.cts.LocationAccessCheckTest" @@ -65,7 +65,7 @@ "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING index 865ee6706..2a4953f51 100644 --- a/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/TEST_MAPPING @@ -7,7 +7,7 @@ "include-filter": "android.permission.cts.OneTimePermissionTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -20,7 +20,7 @@ "include-annotation": "com.android.cts.devicepolicy.annotations.PermissionsTest" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING index d766ee080..3e8c5a19c 100644 --- a/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/privacysources/TEST_MAPPING @@ -33,9 +33,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING index a95df2fd5..01d04bea0 100644 --- a/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/role/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsRoleTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -21,7 +21,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING index 23c1398da..1503c5e57 100644 --- a/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING +++ b/PermissionController/src/com/android/permissioncontroller/safetylabel/TEST_MAPPING @@ -14,7 +14,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -24,7 +24,7 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/SafetyCenter/Config/TEST_MAPPING b/SafetyCenter/Config/TEST_MAPPING index c35d3d777..d8a356636 100644 --- a/SafetyCenter/Config/TEST_MAPPING +++ b/SafetyCenter/Config/TEST_MAPPING @@ -9,7 +9,7 @@ "name": "SafetyCenterConfigTests[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/TEST_MAPPING b/TEST_MAPPING index a47660767..689cd6865 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -9,7 +9,7 @@ "name" : "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -19,7 +19,7 @@ "name" : "CtsPermissionUiTestCases", "options": [ { - "include-annotation": "android.platform.test.annotations.FlakyTest" + "include-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/framework-s/java/android/app/role/TEST_MAPPING b/framework-s/java/android/app/role/TEST_MAPPING index a95df2fd5..01d04bea0 100644 --- a/framework-s/java/android/app/role/TEST_MAPPING +++ b/framework-s/java/android/app/role/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsRoleTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -21,7 +21,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/service/java/com/android/role/TEST_MAPPING b/service/java/com/android/role/TEST_MAPPING index b3507f053..45cf62ff7 100644 --- a/service/java/com/android/role/TEST_MAPPING +++ b/service/java/com/android/role/TEST_MAPPING @@ -13,9 +13,6 @@ "options": [ { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] } @@ -33,9 +30,6 @@ }, { "exclude-annotation": "androidx.test.filters.FlakyTest" - }, - { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" } ] } diff --git a/tests/cts/permission/src/android/permission/cts/AccessibilityPrivacySourceTest.kt b/tests/cts/permission/src/android/permission/cts/AccessibilityPrivacySourceTest.kt index c2927b129..31f8ab417 100644 --- a/tests/cts/permission/src/android/permission/cts/AccessibilityPrivacySourceTest.kt +++ b/tests/cts/permission/src/android/permission/cts/AccessibilityPrivacySourceTest.kt @@ -37,10 +37,10 @@ import android.permission.cts.SafetyCenterUtils.deleteDeviceConfigPrivacyPropert import android.permission.cts.SafetyCenterUtils.deviceSupportsSafetyCenter import android.permission.cts.SafetyCenterUtils.setDeviceConfigPrivacyProperty import android.platform.test.annotations.AppModeFull -import android.platform.test.annotations.FlakyTest import android.platform.test.rule.ScreenRecordRule import android.provider.DeviceConfig import android.safetycenter.SafetyCenterManager +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import androidx.test.runner.AndroidJUnit4 diff --git a/tests/cts/permission/src/android/permission/cts/LocationAccessCheckTest.java b/tests/cts/permission/src/android/permission/cts/LocationAccessCheckTest.java index a4945653a..aed51fa72 100644 --- a/tests/cts/permission/src/android/permission/cts/LocationAccessCheckTest.java +++ b/tests/cts/permission/src/android/permission/cts/LocationAccessCheckTest.java @@ -62,7 +62,6 @@ import android.os.Process; import android.permission.cts.appthataccesseslocation.IAccessLocationOnCommand; import android.platform.test.annotations.AppModeFull; import android.platform.test.annotations.AsbSecurityTest; -import android.platform.test.annotations.FlakyTest; import android.platform.test.annotations.SystemUserOnly; import android.platform.test.rule.ScreenRecordRule; import android.provider.DeviceConfig; @@ -72,6 +71,7 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; diff --git a/tests/cts/permission/src/android/permission/cts/NotificationListenerCheckTest.java b/tests/cts/permission/src/android/permission/cts/NotificationListenerCheckTest.java index 0561f3699..19fc20de6 100644 --- a/tests/cts/permission/src/android/permission/cts/NotificationListenerCheckTest.java +++ b/tests/cts/permission/src/android/permission/cts/NotificationListenerCheckTest.java @@ -29,10 +29,10 @@ import android.app.ActivityOptions; import android.app.PendingIntent; import android.os.Build; import android.platform.test.annotations.AppModeFull; -import android.platform.test.annotations.FlakyTest; import android.platform.test.rule.ScreenRecordRule; import android.service.notification.StatusBarNotification; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; diff --git a/tests/cts/permission/src/android/permission/cts/OneTimePermissionTest.java b/tests/cts/permission/src/android/permission/cts/OneTimePermissionTest.java index 1c07a32b1..baa79d70a 100644 --- a/tests/cts/permission/src/android/permission/cts/OneTimePermissionTest.java +++ b/tests/cts/permission/src/android/permission/cts/OneTimePermissionTest.java @@ -36,10 +36,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.platform.test.annotations.AsbSecurityTest; -import android.platform.test.annotations.FlakyTest; import android.platform.test.rule.ScreenRecordRule; import android.provider.DeviceConfig; +import androidx.test.filters.FlakyTest; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.uiautomator.By; import androidx.test.uiautomator.UiDevice; diff --git a/tests/cts/permission/src/android/permission/cts/SharedUidPermissionsTest.java b/tests/cts/permission/src/android/permission/cts/SharedUidPermissionsTest.java index 94d5bfd62..2c32ddb89 100644 --- a/tests/cts/permission/src/android/permission/cts/SharedUidPermissionsTest.java +++ b/tests/cts/permission/src/android/permission/cts/SharedUidPermissionsTest.java @@ -28,8 +28,8 @@ import static com.google.common.truth.Truth.assertThat; import android.os.Build; import android.platform.test.annotations.AppModeFull; -import android.platform.test.annotations.FlakyTest; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; diff --git a/tests/cts/permission/src/android/permission/cts/SplitPermissionTest.java b/tests/cts/permission/src/android/permission/cts/SplitPermissionTest.java index 46235f1c8..1a847b645 100644 --- a/tests/cts/permission/src/android/permission/cts/SplitPermissionTest.java +++ b/tests/cts/permission/src/android/permission/cts/SplitPermissionTest.java @@ -44,11 +44,11 @@ import android.os.Build; import android.os.Process; import android.os.UserHandle; import android.platform.test.annotations.AppModeFull; -import android.platform.test.annotations.FlakyTest; import android.platform.test.annotations.SystemUserOnly; import androidx.annotation.NonNull; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SdkSuppress; import androidx.test.runner.AndroidJUnit4; diff --git a/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/RestrictedPermissionsTest.java b/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/RestrictedPermissionsTest.java index 95e428f1f..b1f7a3692 100644 --- a/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/RestrictedPermissionsTest.java +++ b/tests/cts/permissionpolicy/src/android/permissionpolicy/cts/RestrictedPermissionsTest.java @@ -48,11 +48,11 @@ import android.content.pm.PermissionInfo; import android.os.Process; import android.os.UserHandle; import android.platform.test.annotations.AppModeFull; -import android.platform.test.annotations.FlakyTest; import android.platform.test.annotations.SystemUserOnly; import android.util.ArraySet; import androidx.annotation.NonNull; +import androidx.test.filters.FlakyTest; import androidx.test.platform.app.InstrumentationRegistry; import com.android.compatibility.common.util.ThrowingRunnable; diff --git a/tests/cts/permissionui/TEST_MAPPING b/tests/cts/permissionui/TEST_MAPPING index f992ea1a3..c703c539d 100644 --- a/tests/cts/permissionui/TEST_MAPPING +++ b/tests/cts/permissionui/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsPermissionUiTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -14,7 +14,7 @@ "name": "CtsPermissionUiTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt index efdbea6d1..5feb48b42 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/AppDataSharingUpdatesTest.kt @@ -30,10 +30,10 @@ import android.permission.cts.PermissionUtils import android.permissionui.cts.AppMetadata.createAppMetadataWithLocationSharingAds import android.permissionui.cts.AppMetadata.createAppMetadataWithLocationSharingNoAds import android.permissionui.cts.AppMetadata.createAppMetadataWithNoSharing -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.safetylabel.SafetyLabelConstants.SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED import android.util.Log +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.DeviceConfigStateChangerRule diff --git a/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt index 548bf033a..5f2ae4670 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/AppPermissionTest.kt @@ -18,10 +18,10 @@ package android.permissionui.cts import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.os.Build -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.provider.Settings import android.provider.Settings.Secure.USER_SETUP_COMPLETE +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.DeviceConfigStateChangerRule diff --git a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt index df099658f..21f80a7a7 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/CameraMicIndicatorsPermissionTest.kt @@ -30,12 +30,12 @@ import android.os.SystemClock import android.os.SystemProperties import android.permission.PermissionManager import android.platform.test.annotations.AsbSecurityTest -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.provider.Settings import android.safetycenter.SafetyCenterManager import android.server.wm.WindowManagerStateHelper import androidx.annotation.RequiresApi +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.platform.app.InstrumentationRegistry import androidx.test.uiautomator.By diff --git a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt index 1a13d688f..e515a7604 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/LocationAccuracyTest.kt @@ -19,7 +19,7 @@ package android.permissionui.cts import android.Manifest.permission.ACCESS_BACKGROUND_LOCATION import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import com.android.modules.utils.build.SdkLevel import org.junit.Assume.assumeFalse diff --git a/tests/cts/permissionui/src/android/permissionui/cts/LocationProviderInterceptDialogTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/LocationProviderInterceptDialogTest.kt index b6a8b3fbf..4367ce24d 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/LocationProviderInterceptDialogTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/LocationProviderInterceptDialogTest.kt @@ -24,7 +24,7 @@ import android.location.LocationManager import android.os.Build import android.permission.cts.MtsIgnore import android.permission.cts.PermissionUtils -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import androidx.test.uiautomator.Until diff --git a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt index 3258efa3a..fef8a83c4 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionTest.kt @@ -18,7 +18,7 @@ package android.permissionui.cts import android.Manifest import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import com.android.compatibility.common.util.CddTest import com.android.compatibility.common.util.SystemUtil diff --git a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt index 17a7a8c5c..d517571ce 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/MediaPermissionUpgradeTest.kt @@ -21,7 +21,7 @@ import android.Manifest.permission.READ_MEDIA_AUDIO import android.Manifest.permission.READ_MEDIA_IMAGES import android.Manifest.permission.READ_MEDIA_VIDEO import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import com.android.compatibility.common.util.CddTest import org.junit.Test diff --git a/tests/cts/permissionui/src/android/permissionui/cts/MultiDevicePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/MultiDevicePermissionTest.kt index 2c98e5209..dc9a2ebf1 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/MultiDevicePermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/MultiDevicePermissionTest.kt @@ -18,7 +18,7 @@ package android.permissionui.cts import android.Manifest import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import org.junit.Assume import org.junit.Before diff --git a/tests/cts/permissionui/src/android/permissionui/cts/NoPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/NoPermissionTest.kt index a62197eee..a5d428812 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/NoPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/NoPermissionTest.kt @@ -17,7 +17,7 @@ package android.permissionui.cts import android.app.Activity -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.runner.AndroidJUnit4 import com.android.modules.utils.build.SdkLevel import org.junit.Assume diff --git a/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt index 33b01307b..447c597a4 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/NotificationPermissionTest.kt @@ -28,8 +28,8 @@ import android.content.pm.PackageManager import android.content.pm.PackageManager.PERMISSION_GRANTED import android.os.Build import android.os.UserHandle -import android.platform.test.annotations.FlakyTest import android.provider.Settings +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import androidx.test.uiautomator.Until diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt index 36c5f455a..6ce85992c 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionDecisionsTest.kt @@ -20,7 +20,7 @@ import android.Manifest import android.content.Intent import android.os.Build import android.permission.PermissionManager -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import androidx.test.uiautomator.Until diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt index 182fb4164..c8df49cb7 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionGroupTest.kt @@ -16,7 +16,7 @@ package android.permissionui.cts -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import org.junit.Test /** diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionPolicyTest25.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionPolicyTest25.kt index acfeba08c..f128e804a 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionPolicyTest25.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionPolicyTest25.kt @@ -19,12 +19,12 @@ package android.permissionui.cts import android.app.Activity import android.content.ComponentName import android.content.Intent -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest +import java.util.concurrent.TimeUnit import org.junit.After import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test -import java.util.concurrent.TimeUnit /** * Tests for the platform permission policy around apps targeting API 25. diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt index 74f3d74ea..43bb05255 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationalePermissionGrantDialogTest.kt @@ -20,9 +20,9 @@ import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION import android.Manifest.permission.CAMERA import android.os.Build -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.safetylabel.SafetyLabelConstants.PERMISSION_RATIONALE_ENABLED +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import com.android.compatibility.common.util.DeviceConfigStateChangerRule import com.android.modules.utils.build.SdkLevel diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationaleTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationaleTest.kt index feac46ec9..eeae0db34 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationaleTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionRationaleTest.kt @@ -21,13 +21,13 @@ import android.app.ActivityManager import android.content.Context import android.content.Intent import android.os.Build -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.safetylabel.SafetyLabelConstants.PERMISSION_RATIONALE_ENABLED import android.text.Spanned import android.text.style.ClickableSpan import android.util.Log import android.view.View +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import androidx.test.uiautomator.Until diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt index 270522ed2..a72e15f10 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt @@ -18,7 +18,7 @@ package android.permissionui.cts import android.content.ComponentName import android.content.Intent -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil import java.lang.Exception diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTest.kt index ea834210f..7c0f69a52 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTest.kt @@ -25,7 +25,7 @@ import android.os.Bundle import android.os.Handler import android.os.Looper import android.os.ResultReceiver -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.rule.ActivityTestRule import androidx.test.runner.AndroidJUnit4 diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt index 8319c1c68..5a6ed45fb 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionSplitTest.kt @@ -17,7 +17,7 @@ package android.permissionui.cts import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import org.junit.Assume.assumeFalse import org.junit.Before diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt index 8dc01955d..8a855f9a0 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt @@ -21,7 +21,7 @@ import android.content.Intent import android.content.pm.PackageManager import android.graphics.Point import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest22.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest22.kt index a0db7eb7f..b529463de 100755 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest22.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest22.kt @@ -16,7 +16,7 @@ package android.permissionui.cts -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import org.junit.Assume import org.junit.Before import org.junit.Test diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest23.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest23.kt index a7a8a533c..65093a402 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest23.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest23.kt @@ -18,7 +18,7 @@ package android.permissionui.cts import android.content.pm.PackageManager import android.permission.cts.MtsIgnore -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import com.android.compatibility.common.util.SystemUtil import org.junit.Assert import org.junit.Assume diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest29.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest29.kt index 2a9261163..09b4092be 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest29.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest29.kt @@ -17,7 +17,7 @@ package android.permissionui.cts import android.permission.cts.MtsIgnore -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.eventually import org.junit.Assume.assumeFalse diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30.kt index 4555fb83c..e6149bddc 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30.kt @@ -19,7 +19,7 @@ package android.permissionui.cts import android.Manifest.permission.ACCESS_BACKGROUND_LOCATION import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import org.junit.Assert.assertNull import org.junit.Test diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt index 898ac6883..2761755c9 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTest30WithBluetooth.kt @@ -30,9 +30,9 @@ import android.location.LocationManager import android.os.Build import android.os.Process import android.os.UserHandle -import android.platform.test.annotations.FlakyTest import android.util.Log import androidx.test.InstrumentationRegistry +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt index 6f1ae8a7c..f153930f4 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUpgradeTest.kt @@ -16,7 +16,7 @@ package android.permissionui.cts -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import org.junit.Assume import org.junit.Test diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUsageInfoTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUsageInfoTest.kt index 0e462e503..0631bb3f3 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionUsageInfoTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionUsageInfoTest.kt @@ -17,7 +17,7 @@ package android.permissionui.cts import android.content.Intent -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import androidx.test.uiautomator.Until import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt index b7d4f5dfb..b484b794b 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PhotoPickerPermissionTest.kt @@ -27,9 +27,9 @@ import android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED import android.content.pm.PackageManager.FLAG_PERMISSION_USER_SET import android.net.Uri import android.os.Build -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.provider.DeviceConfig.NAMESPACE_PRIVACY +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.eventually diff --git a/tests/cts/permissionui/src/android/permissionui/cts/ReviewAccessibilityServicesTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/ReviewAccessibilityServicesTest.kt index 05cd6e497..d08d82158 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/ReviewAccessibilityServicesTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/ReviewAccessibilityServicesTest.kt @@ -23,7 +23,7 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageManager import android.platform.test.annotations.AppModeFull -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry import androidx.test.runner.AndroidJUnit4 import androidx.test.uiautomator.By diff --git a/tests/cts/permissionui/src/android/permissionui/cts/SafetyLabelChangesJobServiceTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/SafetyLabelChangesJobServiceTest.kt index a157d473d..1840abf1b 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/SafetyLabelChangesJobServiceTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/SafetyLabelChangesJobServiceTest.kt @@ -36,11 +36,11 @@ import android.permission.cts.PermissionUtils import android.permission.cts.TestUtils import android.permissionui.cts.AppMetadata.createAppMetadataWithLocationSharingNoAds import android.permissionui.cts.AppMetadata.createAppMetadataWithNoSharing -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig import android.safetylabel.SafetyLabelConstants import android.safetylabel.SafetyLabelConstants.SAFETY_LABEL_CHANGE_NOTIFICATIONS_ENABLED import androidx.test.InstrumentationRegistry +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.DeviceConfigStateChangerRule diff --git a/tests/cts/permissionui/src/android/permissionui/cts/SafetyProtectionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/SafetyProtectionTest.kt index f94fa036c..8515dc1b7 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/SafetyProtectionTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/SafetyProtectionTest.kt @@ -19,8 +19,8 @@ package android.permissionui.cts import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION import android.content.res.Resources -import android.platform.test.annotations.FlakyTest import android.provider.DeviceConfig +import androidx.test.filters.FlakyTest import androidx.test.uiautomator.By import com.android.compatibility.common.util.DeviceConfigStateChangerRule import com.android.modules.utils.build.SdkLevel diff --git a/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt index 63ef1fb8f..b9f689a1f 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/SensorBlockedBannerTest.kt @@ -25,7 +25,7 @@ import android.hardware.SensorPrivacyManager.Sensors.CAMERA import android.hardware.SensorPrivacyManager.Sensors.MICROPHONE import android.location.LocationManager import android.os.Build -import android.platform.test.annotations.FlakyTest +import androidx.test.filters.FlakyTest import androidx.test.filters.SdkSuppress import androidx.test.uiautomator.By import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity diff --git a/tests/cts/role/TEST_MAPPING b/tests/cts/role/TEST_MAPPING index a95df2fd5..01d04bea0 100644 --- a/tests/cts/role/TEST_MAPPING +++ b/tests/cts/role/TEST_MAPPING @@ -4,7 +4,7 @@ "name": "CtsRoleTestCases", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } @@ -21,7 +21,7 @@ "exclude-filter": "android.app.role.cts.RoleManagerTest#removeSmsRoleHolderThenPermissionIsRevoked" }, { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java index 0b563ec0d..f7788e45f 100644 --- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java +++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java @@ -40,7 +40,6 @@ import android.content.pm.PermissionInfo; import android.os.Build; import android.os.Process; import android.os.UserHandle; -import android.platform.test.annotations.FlakyTest; import android.provider.Settings; import android.provider.Telephony; import android.support.test.uiautomator.By; @@ -52,6 +51,7 @@ import android.util.Pair; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.FlakyTest; import androidx.test.filters.SdkSuppress; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; diff --git a/tests/cts/safetycenter/TEST_MAPPING b/tests/cts/safetycenter/TEST_MAPPING index e8c210a5d..b1f60307b 100644 --- a/tests/cts/safetycenter/TEST_MAPPING +++ b/tests/cts/safetycenter/TEST_MAPPING @@ -9,7 +9,7 @@ "name": "CtsSafetyCenterTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING b/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING index 533b4d2a5..dcc2f817f 100644 --- a/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING +++ b/tests/functional/safetycenter/safetycenteractivity/TEST_MAPPING @@ -9,7 +9,7 @@ "name": "SafetyCenterActivityFunctionalTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/tests/functional/safetycenter/singleuser/TEST_MAPPING b/tests/functional/safetycenter/singleuser/TEST_MAPPING index 8285ecd5a..9ba98a87a 100644 --- a/tests/functional/safetycenter/singleuser/TEST_MAPPING +++ b/tests/functional/safetycenter/singleuser/TEST_MAPPING @@ -9,7 +9,7 @@ "name": "SafetyCenterFunctionalTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } diff --git a/tests/functional/safetycenter/subpages/TEST_MAPPING b/tests/functional/safetycenter/subpages/TEST_MAPPING index 455ad21d0..e6802586e 100644 --- a/tests/functional/safetycenter/subpages/TEST_MAPPING +++ b/tests/functional/safetycenter/subpages/TEST_MAPPING @@ -9,7 +9,7 @@ "name": "SafetyCenterSubpagesTestCases[com.google.android.permission.apex]", "options": [ { - "exclude-annotation": "android.platform.test.annotations.FlakyTest" + "exclude-annotation": "androidx.test.filters.FlakyTest" } ] } -- cgit v1.2.3-59-g8ed1b