Merge "Fix an NPE when launching an activity that's not found."

Amith Yamasani · Android (Google) Code Review · commit 3cdfcdc1c480 · 2012-04-18T10:04:28.000-07:00
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java
@@ -2944,7 +2944,7 @@ final int startActivityMayWait(IApplicationThread caller, int callingUid,
         // Collect information about the target of the Intent.
         ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,
                 profileFile, profileFd, userId);
-        if (mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {
+        if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {
             userId = 0;
         }
         aInfo = mService.getActivityInfoForUser(aInfo, userId);

Original file line number	Diff line number	Diff line change
`@@ -2944,7 +2944,7 @@ final int startActivityMayWait(IApplicationThread caller, int callingUid,`
`2944`	`2944`	`// Collect information about the target of the Intent.`
`2945`	`2945`	`ActivityInfo aInfo = resolveActivity(intent, resolvedType, startFlags,`
`2946`	`2946`	`profileFile, profileFd, userId);`
`2947`		`- if (mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {`
	`2947`	`+ if (aInfo != null && mService.isSingleton(aInfo.processName, aInfo.applicationInfo)) {`
`2948`	`2948`	`userId = 0;`
`2949`	`2949`	`}`
`2950`	`2950`	`aInfo = mService.getActivityInfoForUser(aInfo, userId);`