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

Commit e9311649 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by Android (Google) Code Review
Browse files

Merge "Fixed NPE when trying to resize stack with no running activity."

parents 785406c6 0e162185

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+2 −3
Original line number Diff line number Diff line
@@ -2606,9 +2606,8 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        }



        final ActivityRecord r = stack.topRunningActivityLocked(null);

        final TaskRecord topTask = r.task;

        if (!topTask.mResizeable) {

            Slog.w(TAG, "resizeStack: top task " + topTask + " not resizeable.");

        if (r != null && !r.task.mResizeable) {

            Slog.w(TAG, "resizeStack: top task " + r.task + " not resizeable.");

            return;

        }