Merge "Update uiautomator references in base/apct-tests/perftests/blobstore" am: 6044b1c78f am: 047e4863d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2531499 Change-Id: I259aca8d692129124f6d29db7f70541c52cc142d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -29,7 +29,7 @@ android_test {
|
||||
"androidx.test.rules",
|
||||
"androidx.annotation_annotation",
|
||||
"apct-perftests-utils",
|
||||
"ub-uiautomator",
|
||||
"androidx.test.uiautomator_uiautomator",
|
||||
"collector-device-lib-platform",
|
||||
"androidx.benchmark_benchmark-macro",
|
||||
],
|
||||
|
||||
@@ -21,10 +21,10 @@ import android.app.UiAutomation;
|
||||
import android.os.ParcelFileDescriptor;
|
||||
import android.perftests.utils.TraceMarkParser;
|
||||
import android.perftests.utils.TraceMarkParser.TraceMarkSlice;
|
||||
import android.support.test.uiautomator.UiDevice;
|
||||
import android.util.Log;
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
import androidx.test.uiautomator.UiDevice;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.IOException;
|
||||
|
||||
@@ -25,12 +25,12 @@ import android.perftests.utils.ManualBenchmarkState;
|
||||
import android.perftests.utils.PerfManualStatusReporter;
|
||||
import android.perftests.utils.TraceMarkParser;
|
||||
import android.perftests.utils.TraceMarkParser.TraceMarkSlice;
|
||||
import android.support.test.uiautomator.UiDevice;
|
||||
import android.util.DataUnit;
|
||||
|
||||
import androidx.benchmark.macro.MacrobenchmarkScope;
|
||||
import androidx.test.filters.LargeTest;
|
||||
import androidx.test.platform.app.InstrumentationRegistry;
|
||||
import androidx.test.uiautomator.UiDevice;
|
||||
|
||||
import com.android.utils.blob.FakeBlobData;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user