Merge "VirtualDisplayTest: Rethrow runOnUiThread exceptions on test thread" into tm-dev

core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java

@@ -332,21 +332,23 @@ public class VirtualDisplayTest extends AndroidTestCase {
     }
 
     private void runOnUiThread(Runnable runnable) {
-        Runnable waiter = new Runnable() {
+        final Throwable[] thrown = new Throwable[1];
-            @Override
+        assertTrue("Timed out", mHandler.runWithScissors(() -> {
-            public void run() {
-                synchronized (this) {
-                    notifyAll();
-                }
-            }
-        };
-        synchronized (waiter) {
-            mHandler.post(runnable);
-            mHandler.post(waiter);
             try {
-                waiter.wait(TIMEOUT);
+                runnable.run();
-            } catch (InterruptedException ex) {
+            } catch (Throwable t) {
+                t.printStackTrace();
+                thrown[0] = t;
             }
+        }, TIMEOUT));
+        if (thrown[0] != null) {
+            if (thrown[0] instanceof RuntimeException) {
+                throw (RuntimeException) thrown[0];
+            }
+            if (thrown[0] instanceof Error) {
+                throw (Error) thrown[0];
+            }
+            throw new RuntimeException(thrown[0]);
         }
     }