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

Commit f82cb86b authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Fix to NullPointerException on move back in ActivityStack." into cm-11.0

parents 2142c2cf 5b36ce1d

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -3206,9 +3206,7 @@ final class ActivityStack { 




        final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;

        final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null;

        if (task == tr && task.mOnTopOfHome || numTasks <= 1) {

        if (task == tr && task.mOnTopOfHome || numTasks <= 1) {

            if (task != null) {

            tr.mOnTopOfHome = false;

                task.mOnTopOfHome = false;

            }

            return mStackSupervisor.resumeHomeActivity(null);

            return mStackSupervisor.resumeHomeActivity(null);

        }

        }