diff options
5 files changed, 9 insertions, 4 deletions
diff --git a/tests/permission/Android.bp b/tests/permission/Android.bp index d06809b209a0..b02f410c733e 100644 --- a/tests/permission/Android.bp +++ b/tests/permission/Android.bp @@ -20,6 +20,7 @@ android_test { "androidx.test.runner", "junit", "platform-test-annotations", + "androidx.test.rules", ], platform_apis: true, test_suites: ["device-tests"], diff --git a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java index 5fb23b0ad507..99ca9c084b54 100644 --- a/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java @@ -21,7 +21,8 @@ import android.app.ActivityTaskManager; import android.app.IActivityManager; import android.content.res.Configuration; import android.os.RemoteException; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import junit.framework.TestCase; diff --git a/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java b/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java index 299d8d003d9c..0c9d447a3ac1 100644 --- a/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/PmPermissionsTests.java @@ -19,7 +19,8 @@ package com.android.framework.permission.tests; import android.app.PackageInstallObserver; import android.content.pm.PackageManager; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; /** * Verify PackageManager api's that require specific permissions. diff --git a/tests/permission/src/com/android/framework/permission/tests/SmsManagerPermissionTest.java b/tests/permission/src/com/android/framework/permission/tests/SmsManagerPermissionTest.java index 41727431bd5e..2fa0b2164835 100644 --- a/tests/permission/src/com/android/framework/permission/tests/SmsManagerPermissionTest.java +++ b/tests/permission/src/com/android/framework/permission/tests/SmsManagerPermissionTest.java @@ -18,7 +18,8 @@ package com.android.framework.permission.tests; import android.telephony.SmsManager; import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.SmallTest; + +import androidx.test.filters.SmallTest; import java.util.ArrayList; diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index 330bc84d7a76..e67fd6702f7b 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -23,9 +23,10 @@ import android.os.Binder; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.test.suitebuilder.annotation.SmallTest; import android.view.IWindowManager; +import androidx.test.filters.SmallTest; + import junit.framework.TestCase; /** |