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

Commit 6487dee4 authored by Yichun Li's avatar Yichun Li Committed by Automerger Merge Worker
Browse files

Merge "Update uiautomator references in... 

Merge "Update uiautomator references in frameworks/base/tests/ActivityManagerPerfTests/utils" am: 6b982465 am: 49e63138 am: 81c99faa am: a1818484 am: 6215a83c

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



Change-Id: I599c02940cabf7ab98bd3ae982bc9acf1e302741
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d458176 6215a83c

tests/ActivityManagerPerfTests/utils/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ java_test { 
    static_libs: [

        "androidx.test.rules",

        "junit",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],

}

tests/ActivityManagerPerfTests/utils/src/com/android/frameworks/perftests/am/util/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@ package com.android.frameworks.perftests.am.util; 
import android.content.Intent;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.support.test.uiautomator.UiDevice;

import android.util.Log;



import androidx.test.InstrumentationRegistry;

import androidx.test.uiautomator.UiDevice;



import java.io.IOException;