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

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

Merge "Update uiautomator references in frameworks/base/tests/Input" am:... 

Merge "Update uiautomator references in frameworks/base/tests/Input" am: bf542192 am: 41f4c14c am: 6ade4cb3 am: 9a4e121b am: e5b5870c

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



Change-Id: Iec3c2fca55ec4b2adf8aa0f5450a3aa76ba7f76c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 990c7ad7 e5b5870c

tests/Input/Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ android_test { 
        "services.core.unboosted",

        "services.core.unboosted",

        "testables",

        "testables",

        "truth-prebuilt",

        "truth-prebuilt",

        "ub-uiautomator",

        "androidx.test.uiautomator_uiautomator",

    ],

    ],

    test_suites: ["device-tests"],

    test_suites: ["device-tests"],

}
 
}

tests/Input/src/com/android/test/input/AnrTest.kt

+5 −4
Original line number Original line Diff line number Diff line
@@ -27,14 +27,15 @@ import android.os.IInputConstants.UNMULTIPLIED_DEFAULT_DISPATCHING_TIMEOUT_MILLI 
import android.os.SystemClock

import android.os.SystemClock

import android.provider.Settings

import android.provider.Settings

import android.provider.Settings.Global.HIDE_ERROR_DIALOGS

import android.provider.Settings.Global.HIDE_ERROR_DIALOGS

import android.support.test.uiautomator.By

import android.support.test.uiautomator.UiDevice

import android.support.test.uiautomator.UiObject2

import android.support.test.uiautomator.Until

import android.testing.PollingCheck

import android.testing.PollingCheck

import android.view.InputDevice

import android.view.InputDevice

import android.view.MotionEvent

import android.view.MotionEvent





import androidx.test.uiautomator.By

import androidx.test.uiautomator.UiDevice

import androidx.test.uiautomator.UiObject2

import androidx.test.uiautomator.Until



import org.junit.After

import org.junit.After

import org.junit.Assert.assertEquals

import org.junit.Assert.assertEquals

import org.junit.Assert.assertTrue

import org.junit.Assert.assertTrue