summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorBrett Chabot <>2009-04-02 09:56:38 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-04-02 09:56:38 -0700
commitff51fe211d87fd97377f7ac1afb783ea154dba6e (patch)
tree56b1b49558dacef1ad9bf1f5eab3086369c81494 /test-runner
parent3547cc01246059ef52d36e0cc6d4c3877a94d6ed (diff)
downloadframeworks_base-ff51fe211d87fd97377f7ac1afb783ea154dba6e.zip
frameworks_base-ff51fe211d87fd97377f7ac1afb783ea154dba6e.tar.gz
frameworks_base-ff51fe211d87fd97377f7ac1afb783ea154dba6e.tar.bz2
AI 144107: am: CL 144098 am: CL 144093 Fix NPE in ActivityUnitTestCase.
Original author: brettchabot Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 144107
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;