Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update uiautomator references in base/apct-tests/perftests/blobstore" am: 6044b1c78f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2531499

Change-Id: I5402a9c5e65da557696952a90ff7198f791f5778
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yichun Li
2023-04-12 17:28:10 +00:00
committed by Automerger Merge Worker
parent f739751fef 6044b1c78f
commit 047e4863d5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apct-tests/perftests/blobstore/Android.bp
View File

@@ -29,7 +29,7 @@ android_test {
"androidx.test.rules", "androidx.test.rules",
"androidx.annotation_annotation", "androidx.annotation_annotation",
"apct-perftests-utils", "apct-perftests-utils",
"ub-uiautomator", "androidx.test.uiautomator_uiautomator",
"collector-device-lib-platform", "collector-device-lib-platform",
"androidx.benchmark_benchmark-macro", "androidx.benchmark_benchmark-macro",
], ],

2
apct-tests/perftests/blobstore/src/com/android/perftests/blob/AtraceUtils.java
View File

@@ -21,10 +21,10 @@ import android.app.UiAutomation;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.perftests.utils.TraceMarkParser; import android.perftests.utils.TraceMarkParser;
import android.perftests.utils.TraceMarkParser.TraceMarkSlice; import android.perftests.utils.TraceMarkParser.TraceMarkSlice;
import android.support.test.uiautomator.UiDevice;
import android.util.Log; import android.util.Log;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.uiautomator.UiDevice;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;

2
apct-tests/perftests/blobstore/src/com/android/perftests/blob/BlobStorePerfTests.java
View File

@@ -25,12 +25,12 @@ import android.perftests.utils.ManualBenchmarkState;
import android.perftests.utils.PerfManualStatusReporter; import android.perftests.utils.PerfManualStatusReporter;
import android.perftests.utils.TraceMarkParser; import android.perftests.utils.TraceMarkParser;
import android.perftests.utils.TraceMarkParser.TraceMarkSlice; import android.perftests.utils.TraceMarkParser.TraceMarkSlice;
import android.support.test.uiautomator.UiDevice;
import android.util.DataUnit; import android.util.DataUnit;
import androidx.benchmark.macro.MacrobenchmarkScope; import androidx.benchmark.macro.MacrobenchmarkScope;
import androidx.test.filters.LargeTest; import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.uiautomator.UiDevice;
import com.android.utils.blob.FakeBlobData; import com.android.utils.blob.FakeBlobData;