From ff51fe211d87fd97377f7ac1afb783ea154dba6e Mon Sep 17 00:00:00 2001
From: Brett Chabot <>
Date: Thu, 2 Apr 2009 09:56:38 -0700
Subject: [PATCH] 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
---
 test-runner/android/test/ActivityUnitTestCase.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test-runner/android/test/ActivityUnitTestCase.java b/test-runner/android/test/ActivityUnitTestCase.java
index dfd8fc24f1ff6..6bd19a62231ba 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;