Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update uiautomator references in frameworks/base/tests/Input" am: bf5421928e am: 41f4c14c49

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

Change-Id: I5f490a55809866aa97990f0af68f53ebdddd7cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yichun Li
2023-04-12 17:10:04 +00:00
committed by Automerger Merge Worker
parent f3dbfcfb86 41f4c14c49
commit 6ade4cb3bb
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Input/Android.bp
View File

@@ -21,7 +21,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"],
} }

9
tests/Input/src/com/android/test/input/AnrTest.kt
View File

@@ -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