summaryrefslogtreecommitdiffstats
path: root/test-runner/src/android/test/InstrumentationTestRunner.java
diff options
context:
space:
mode:
Diffstat (limited to 'test-runner/src/android/test/InstrumentationTestRunner.java')
-rw-r--r--test-runner/src/android/test/InstrumentationTestRunner.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java
index 3ac74f7..5ce3efc 100644
--- a/test-runner/src/android/test/InstrumentationTestRunner.java
+++ b/test-runner/src/android/test/InstrumentationTestRunner.java
@@ -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();