Merge "Update uiautomator references in frameworks/base/tests/WindowAnimationJank" am: 9a9bfd8240

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

Change-Id: Iba97b14a5890c07856125e998cc6005075824c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yichun Li
2023-04-12 19:05:11 +00:00
committed by Automerger Merge Worker
3 changed files with 8 additions and 8 deletions

View File

@@ -25,7 +25,7 @@ android_test {
name: "WindowAnimationJank",
srcs: ["src/**/*.java"],
static_libs: [
"ub-uiautomator",
"androidx.test.uiautomator_uiautomator",
"androidx.test.janktesthelper",
"junit",
],

View File

@@ -18,11 +18,12 @@ import android.app.UiAutomation;
import android.content.ComponentName;
import android.content.Intent;
import android.os.SystemClock;
import android.support.test.uiautomator.By;
import android.support.test.uiautomator.BySelector;
import android.support.test.uiautomator.UiDevice;
import android.support.test.uiautomator.UiObject2;
import android.support.test.uiautomator.Until;
import androidx.test.uiautomator.By;
import androidx.test.uiautomator.BySelector;
import androidx.test.uiautomator.UiDevice;
import androidx.test.uiautomator.UiObject2;
import androidx.test.uiautomator.Until;
/**
* Set of helpers to manipulate test activities.

View File

@@ -16,9 +16,8 @@
package android.windowanimationjank;
import android.support.test.uiautomator.UiDevice;
import androidx.test.jank.JankTestBase;
import androidx.test.uiautomator.UiDevice;
/**
* This adds additional system level jank monitor and its result is merged with primary monitor