Merge "Fix button click on older platforms" into main

2 files changed, 16 insertions, 12 deletions

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt
index d8eb153bf..b2da92d22 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/BasePermissionTest.kt
@@ -121,7 +121,7 @@ abstract class BasePermissionTest {
                     /* PackageManager.FEATURE_CAR_SPLITSCREEN_MULTITASKING */
                     "android.software.car.splitscreen_multitasking")
         @JvmStatic
-        private val isAutomotiveVisibleBackgroundUser = isAutomotive &&
+        protected val isAutomotiveVisibleBackgroundUser = isAutomotive &&
             UserHelper(context).isVisibleBackgroundUser()
 
         // TODO(b/382327037):find a way to avoid specifying the display ID for each UiSelector.
diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt
index 56072d521..68af60dde 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionTapjackingTest.kt
@@ -157,17 +157,21 @@ class PermissionTapjackingTest : BaseUsePermissionTest() {
     }
 
     private fun click(buttonCenter: Point) {
-        val downTime = SystemClock.uptimeMillis()
-        val x = buttonCenter.x.toFloat()
-        val y = buttonCenter.y.toFloat()
-        var event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, x, y, 0)
-        event.displayId = displayId
-        uiAutomation.injectInputEvent(event, true)
-
-        val upTime = SystemClock.uptimeMillis()
-        event = MotionEvent.obtain(upTime, upTime, MotionEvent.ACTION_UP, x, y, 0)
-        event.displayId = displayId
-        uiAutomation.injectInputEvent(event, true)
+        if (isAutomotiveVisibleBackgroundUser) {
+            val downTime = SystemClock.uptimeMillis()
+            val x = buttonCenter.x.toFloat()
+            val y = buttonCenter.y.toFloat()
+            var event = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN, x, y, 0)
+            event.displayId = displayId
+            uiAutomation.injectInputEvent(event, true)
+
+            val upTime = SystemClock.uptimeMillis()
+            event = MotionEvent.obtain(upTime, upTime, MotionEvent.ACTION_UP, x, y, 0)
+            event.displayId = displayId
+            uiAutomation.injectInputEvent(event, true)
+        } else {
+            uiDevice.click(buttonCenter.x, buttonCenter.y)
+        }
     }
 
     companion object {