summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tyler Dewey <deweytyl@google.com> 2023-01-11 19:02:02 +0000
committer Tyler Dewey <deweytyl@google.com> 2023-01-11 20:21:08 +0000
commit20d51c4ecfe9ef9771eb9f64ca80cf5240e50663 (patch)
tree82d9a97a169278fb333317d41638b324b3b490d8
parentfe0722ebab79068e3f6639fc4e778eff98a90e9d (diff)
Fix some little details missed when extracting the shared testing
library. Bug: 239682646 Test: atest SafetyCenterHostSideTestCases CtsSafetyCenterTestCases SafetyCenterPersistenceTests Relnote: n/a Change-Id: Ib7e50a5271c817f980e944d0e524bb227e0e3782
-rw-r--r--SafetyCenter/Persistence/tests/Android.bp2
-rw-r--r--tests/utils/safetycenter/AndroidManifest.xml2
-rw-r--r--tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterActivityLauncher.kt2
3 files changed, 3 insertions, 3 deletions
diff --git a/SafetyCenter/Persistence/tests/Android.bp b/SafetyCenter/Persistence/tests/Android.bp
index 605db5f75..06cfe6a44 100644
--- a/SafetyCenter/Persistence/tests/Android.bp
+++ b/SafetyCenter/Persistence/tests/Android.bp
@@ -27,8 +27,8 @@ android_test {
static_libs: [
"compatibility-device-util-axt",
"kotlinx-coroutines-android",
- "safety-center-test-util-lib",
"safety-center-persistence",
+ "safety-center-test-util-lib",
],
test_suites: [
"general-tests",
diff --git a/tests/utils/safetycenter/AndroidManifest.xml b/tests/utils/safetycenter/AndroidManifest.xml
index 2d748c5c7..5590e8393 100644
--- a/tests/utils/safetycenter/AndroidManifest.xml
+++ b/tests/utils/safetycenter/AndroidManifest.xml
@@ -14,6 +14,6 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<manifest package="com.android.permission.testing">
+<manifest package="com.android.safetycenter.testing">
<application/>
</manifest>
diff --git a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterActivityLauncher.kt b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterActivityLauncher.kt
index 20b4ca806..b762b58ac 100644
--- a/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterActivityLauncher.kt
+++ b/tests/utils/safetycenter/java/com/android/safetycenter/testing/SafetyCenterActivityLauncher.kt
@@ -25,7 +25,7 @@ import android.content.Intent.ACTION_VIEW_SAFETY_CENTER_QS
import android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK
import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
import android.os.Bundle
-import com.android.compatibility.common.util.UiAutomatorUtils.getUiDevice
+import com.android.compatibility.common.util.UiAutomatorUtils2.getUiDevice
import com.android.safetycenter.testing.ShellPermissions.callWithShellPermissionIdentity
/** A class that provides a way to launch the SafetyCenter activity in tests. */