Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Amith Yamasani
2012-04-18 10:04:28 -07:00
committed by Android (Google) Code Review
parent f52b6ede24 95a6a96e1c
commit 3cdfcdc1c4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityStack.java
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);