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

Fix issue #17175312: Calendar crashed when tapping on the event notification

Browse Source 
mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
This commit is contained in:
Dianne Hackborn
2014-09-03 16:40:49 -07:00
parent 02aa75a083
commit 925e2b3352
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/am/ActivityStack.java
View File

@@ -456,7 +456,7 @@ final class ActivityStack {
final ActivityRecord r = ActivityRecord.forToken(token);
if (r != null) {
final TaskRecord task = r.task;
if (task.mActivities.contains(r) && mTaskHistory.contains(task)) {
if (task != null && task.mActivities.contains(r) && mTaskHistory.contains(task)) {
if (task.stack != this) Slog.w(TAG,
"Illegal state! task does not point to stack it is in.");
return r;