diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-04-18 10:04:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-18 10:04:28 -0700 |
| commit | 3cdfcdc1c4802ecc2f0eb6beb6f7bdb714a85d2d (patch) | |
| tree | e464a11dfd8ddc0fd3a54f2a3967c98c3b5f3dd3 | |
| parent | f52b6ede246cbf3d453d9c7093fa02d145e031ad (diff) | |
| parent | 95a6a96e1cfb79b1960bb2a9e6bc22d9d8e5a238 (diff) | |
| download | frameworks_base-3cdfcdc1c4802ecc2f0eb6beb6f7bdb714a85d2d.zip frameworks_base-3cdfcdc1c4802ecc2f0eb6beb6f7bdb714a85d2d.tar.gz frameworks_base-3cdfcdc1c4802ecc2f0eb6beb6f7bdb714a85d2d.tar.bz2 | |
Merge "Fix an NPE when launching an activity that's not found."
| -rw-r--r-- | services/java/com/android/server/am/ActivityStack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityStack.java b/services/java/com/android/server/am/ActivityStack.java index 2c53186..9085cea 100644 --- a/services/java/com/android/server/am/ActivityStack.java +++ b/services/java/com/android/server/am/ActivityStack.java @@ -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); |