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

Commit b9f538ed authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Fixes NullPointerException" into main

parents c1290869 1c1de947

services/core/java/com/android/server/wm/Task.java

+3 −2
Original line number Diff line number Diff line
@@ -1277,8 +1277,9 @@ class Task extends TaskFragment { 
            final ActivityRecord top = topRunningActivity();

            final ActivityRecord resumedActivity = getResumedActivity();

            if (resumedActivity != null

                    && (top.getTaskFragment() != this || !canBeResumed(resuming))) {

                // Pausing the resumed activity because it is occluded by other task fragment.

                    && (top == null || top.getTaskFragment() != this || !canBeResumed(resuming))) {

                // Pausing the resumed activity because it is occluded by other task fragment, or

                // should not be remained in resumed state.

                if (startPausing(false /* uiSleeping*/, resuming, reason)) {

                    someActivityPaused[0]++;

                }