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

Commit 751073ac authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in InstrumentationTestRunner"

parents c6aa9edc 48983959

test-runner/src/android/test/InstrumentationTestRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ public class InstrumentationTestRunner extends Instrumentation implements TestSu 
            mIncludeDetailedStats = false;

            try {

                // Look for TimedTest annotation on both test class and test method

                if (testMethod.isAnnotationPresent(TimedTest.class)) {

                if (testMethod != null && testMethod.isAnnotationPresent(TimedTest.class)) {

                    mIsTimedTest = true;

                    mIncludeDetailedStats = testMethod.getAnnotation(

                            TimedTest.class).includeDetailedStats();