Merge "Add logs during activity result timeout" into main

1 files changed, 9 insertions, 1 deletions

diff --git a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
index 1e6923592..9ec09137e 100644
--- a/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
+++ b/tests/cts/permissionui/src/android/permissionui/cts/BaseUsePermissionTest.kt
@@ -64,6 +64,7 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
+import java.util.concurrent.TimeoutException
 
 abstract class BaseUsePermissionTest : BasePermissionTest() {
     companion object {
@@ -700,7 +701,14 @@ abstract class BaseUsePermissionTest : BasePermissionTest() {
         } else {
             block()
         }
-        return future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        try {
+            return future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        } catch (e: TimeoutException) {
+            val uiDump = StringBuilder()
+            UiDumpUtils.dumpNodes(uiDump)
+            Log.e(LOG_TAG, "Timed out waiting for activity result, UI dump: $uiDump")
+            throw e
+        }
     }
 
     /**