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

Commit e4d2c176 authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when removing PIP stack" into rvc-dev

parents 3bf50bdd f488523e

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

+5 −1
Original line number Diff line number Diff line
@@ -715,9 +715,13 @@ class ActivityStack extends Task { 


    private void setWindowingModeInSurfaceTransaction(int preferredWindowingMode,

            boolean creating) {

        final TaskDisplayArea taskDisplayArea = getDisplayArea();

        if (taskDisplayArea == null) {

            Slog.d(TAG, "taskDisplayArea is null, bail early");

            return;

        }

        final int currentMode = getWindowingMode();

        final int currentOverrideMode = getRequestedOverrideWindowingMode();

        final TaskDisplayArea taskDisplayArea = getDisplayArea();

        final Task topTask = getTopMostTask();

        int windowingMode = preferredWindowingMode;

        if (preferredWindowingMode == WINDOWING_MODE_UNDEFINED