summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorBrett Chabot <>2009-04-01 15:15:33 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-01 15:15:33 -0700
commit79ad6262314281dff10f7c4ed90fec893a60e274 (patch)
treeccc3f1098cdff730bcd4fda2175bd2dd6366e46a /test-runner
parentd7f347bdc878109df1f34c5015de2dc9f531d87b (diff)
downloadframeworks_base-79ad6262314281dff10f7c4ed90fec893a60e274.zip
frameworks_base-79ad6262314281dff10f7c4ed90fec893a60e274.tar.gz
frameworks_base-79ad6262314281dff10f7c4ed90fec893a60e274.tar.bz2
AI 144098: am: CL 144093 Fix NPE in ActivityUnitTestCase.
Original author: brettchabot Merged from: //branches/cupcake/... Automated import of CL 144098
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/android/test/ActivityUnitTestCase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test-runner/android/test/ActivityUnitTestCase.java b/test-runner/android/test/ActivityUnitTestCase.java
index dfd8fc2..6bd19a6 100644
--- a/test-runner/android/test/ActivityUnitTestCase.java
+++ b/test-runner/android/test/ActivityUnitTestCase.java
@@ -136,7 +136,7 @@ public abstract class ActivityUnitTestCase<T extends Activity>
ComponentName cn = new ComponentName(mActivityClass.getPackage().getName(),
mActivityClass.getName());
intent.setComponent(cn);
- ActivityInfo info = null;
+ ActivityInfo info = new ActivityInfo();
CharSequence title = mActivityClass.getName();
mMockParent = new MockParent();
String id = null;