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

Commit c50e7e84 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17175312: Calendar crashed when tapping on the event notification" into lmp-dev

parents 3f70141e 925e2b33

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;