commit 925e2b335237153648ecad84d5fa280669f4cf1a
author Dianne Hackborn <hackbod@google.com> Wed Sep 03 16:40:49 2014 -0700
committer Dianne Hackborn <hackbod@google.com> Thu Sep 04 11:26:09 2014 -0700
tree a7046050e72fdd1426fb04fe2c5aaa40c8798ff7
parent 02aa75a08303796801ffd74b9c0bd2f8079248af

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

mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51

services/core/java/com/android/server/am/ActivityStack.java

diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index 3efd049..e83963d 100755
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -456,7 +456,7 @@
         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;