Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 925e2b33 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

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

mActivities can be null.

Change-Id: I9cc1a08d19d2c38a4ebaaf0ed2168cfbeeaf3b51
parent 02aa75a0

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

+1 −1
Original line number Diff line number Diff line
@@ -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;