Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils" am: 6b982465e8 am: 49e631387c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2531560 Change-Id: If3209823cdfdb265102586f3f19b317e096a72a8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -32,6 +32,6 @@ java_test {
|
|||||||
static_libs: [
|
static_libs: [
|
||||||
"androidx.test.rules",
|
"androidx.test.rules",
|
||||||
"junit",
|
"junit",
|
||||||
"ub-uiautomator",
|
"androidx.test.uiautomator_uiautomator",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ package com.android.frameworks.perftests.am.util;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.os.ResultReceiver;
|
import android.os.ResultReceiver;
|
||||||
import android.support.test.uiautomator.UiDevice;
|
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import androidx.test.InstrumentationRegistry;
|
import androidx.test.InstrumentationRegistry;
|
||||||
|
import androidx.test.uiautomator.UiDevice;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user