Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0eecda20 authored by Yichun Li's avatar Yichun Li Committed by Automerger Merge Worker
Browse files

Merge "Update uiautomator references in base/apct-tests/perftests/blobstore"... 

Merge "Update uiautomator references in base/apct-tests/perftests/blobstore" am: 6044b1c7 am: 047e4863 am: fa6fdd82

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



Change-Id: Id43c5cf2326908cfd1aaa3b18b273653ded91ada
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4979a58 fa6fdd82

apct-tests/perftests/blobstore/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -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",

    ],

    ],

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;