diff options
| author | 2023-01-12 17:49:31 +0000 | |
|---|---|---|
| committer | 2023-01-12 17:49:31 +0000 | |
| commit | 9fdc727bbcb0e98fa16df7d2a75ae036285befe1 (patch) | |
| tree | 5953a62a59ba0075ee02cff08f62e45f39de271f | |
| parent | beb43a5baf319ac6f257b454107a17e87e315b7a (diff) | |
| parent | 20d51c4ecfe9ef9771eb9f64ca80cf5240e50663 (diff) | |
Fix some little details missed when extracting the shared testing am: 20d51c4ecf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/20946683
Change-Id: Ibe99e557f3a68b087923a08f9c015e60f564e8ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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. */ |