From a8db0a4ff6689f9f00dea6af44e65aa32a8546e1 Mon Sep 17 00:00:00 2001
From: Jack Wang <jackwang@google.com>
Date: Mon, 17 Aug 2009 14:19:52 -0700
Subject: [PATCH] Fix bug 2056252:
 android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing -
 Verify mInstrumentation is not null before calling getContext()

---
 test-runner/android/test/AndroidTestRunner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-runner/android/test/AndroidTestRunner.java b/test-runner/android/test/AndroidTestRunner.java
index 00440b4350d91..0d4e1e967bcde 100644
--- a/test-runner/android/test/AndroidTestRunner.java
+++ b/test-runner/android/test/AndroidTestRunner.java
@@ -158,7 +158,7 @@ public class AndroidTestRunner extends BaseTestRunner {
             mTestResult.addListener(testListener);
         }
 
-        Context testContext = mInstrumentation.getContext();
+        Context testContext = mInstrumentation == null ? mContext : mInstrumentation.getContext();
         for (TestCase testCase : mTestCases) {
             setContextIfAndroidTestCase(testCase, mContext, testContext);
             setInstrumentationIfInstrumentationTestCase(testCase, mInstrumentation);