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

Bug: 6356194
Change-Id: I66aeeda3ecab36a4aa32fb78c1d0559a73cd9a7a
This commit is contained in:
Amith Yamasani
2012-04-18 09:54:43 -07:00
parent d7f256dd2f
commit 95a6a96e1c

View File

@@ -2944,7 +2944,7 @@ final class ActivityStack {
// 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);