Merge branch 'readonly-p4-master'

2009-04-02 09:57:46 -07:00
parent 070410ec7f ff51fe211d
commit df07e69e26
1 changed files with 1 additions and 1 deletions
--- 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;