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

Commit 1fbb5da2 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 29bbd570: am 1f0f9fa9: Merge "Add null pointer check." into klp-dev 

* commit '29bbd570':
  Add null pointer check.
parents 3857dbe1 29bbd570

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

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


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

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

            if (task != null) {

                task.mOnTopOfHome = false;

            }

            return mStackSupervisor.resumeHomeActivity(null);

        }