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

Commit 38bcf6dc authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 422d7003: am f431daa2: Merge "Fix to NullPointerException on move back in ActivityStack." 

* commit '422d7003':
  Fix to NullPointerException on move back in ActivityStack.
parents a759b3d2 422d7003

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

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


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

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

            if (task != null) {

                task.mOnTopOfHome = false;

            }

            tr.mOnTopOfHome = false;

            return mStackSupervisor.resumeHomeActivity(null);

        }