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

Commit 59b5faf9 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 packages/PrintSpooler/tests/outofprocess" am: 5d97ee54 am: 85bce9ad am: 7f2a2626 am: 37b6771f am: a082ffd0

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



Change-Id: I605fd8a6c70b2512ef17e8035f1440a042c6b3de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 621e843e a082ffd0

packages/PrintSpooler/tests/outofprocess/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ android_test { 
    libs: ["android.test.runner.stubs"],

    static_libs: [

        "androidx.test.rules",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

        "mockito-target-minus-junit4",

        "print-test-util-lib",

    ],

packages/PrintSpooler/tests/outofprocess/src/com/android/printspooler/outofprocess/tests/WorkflowTest.java

+6 −6
Original line number Diff line number Diff line
@@ -35,15 +35,15 @@ import android.print.test.services.AddPrintersActivity; 
import android.print.test.services.FirstPrintService;

import android.print.test.services.PrinterDiscoverySessionCallbacks;

import android.print.test.services.StubbablePrinterDiscoverySession;

import android.support.test.uiautomator.By;

import android.support.test.uiautomator.UiDevice;

import android.support.test.uiautomator.UiObject;

import android.support.test.uiautomator.UiObjectNotFoundException;

import android.support.test.uiautomator.UiSelector;

import android.support.test.uiautomator.Until;

import android.util.Log;



import androidx.test.filters.LargeTest;

import androidx.test.uiautomator.By;

import androidx.test.uiautomator.UiDevice;

import androidx.test.uiautomator.UiObject;

import androidx.test.uiautomator.UiObjectNotFoundException;

import androidx.test.uiautomator.UiSelector;

import androidx.test.uiautomator.Until;



import org.junit.Test;

import org.junit.runner.RunWith;