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

Commit a56a3528 authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am f2f68760: Merge change Ib3d582d7 into eclair-mr2 

Merge commit 'f2f68760' into eclair-mr2-plus-aosp

* commit 'f2f68760':
  Fix crash with @UiThreadTest in InstrumentationTestCase.
parents 23915ddd f2f68760

core/java/android/test/InstrumentationTestCase.java

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ public class InstrumentationTestCase extends TestCase { 
            getInstrumentation().runOnMainSync(new Runnable() {

                public void run() {

                    try {

                        m.invoke(this);                        

                        m.invoke(InstrumentationTestCase.this);                        

                    } catch (Throwable throwable) {

                        exceptions[0] = throwable;

                    }