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

Commit fe54bb51 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/WindowAnimationJank" am: 9a9bfd82 am: 60229aed am: 2c0df1b5

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



Change-Id: If72c76db6600695166342757d85def9883885b6e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41b64289 2c0df1b5

tests/WindowAnimationJank/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android_test { 
    name: "WindowAnimationJank",

    srcs: ["src/**/*.java"],

    static_libs: [

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "androidx.test.janktesthelper",

        "junit",

    ],

tests/WindowAnimationJank/src/android/windowanimationjank/Utils.java

+6 −5
Original line number Diff line number Diff line
@@ -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.

tests/WindowAnimationJank/src/android/windowanimationjank/WindowAnimationJankTestBase.java

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