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

Commit dc5c3d64 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix PinnedStackTests#testPinnedStackWithDockedStack" into rvc-dev am: 72d1e657 

Change-Id: I266db11eec93b7ca507830354306690ab03a5ed8
parents f6b539ca 72d1e657

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

+5 −0
Original line number Diff line number Diff line
@@ -2786,6 +2786,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }



        final int prevMode = task.getWindowingMode();

        if (prevMode == windowingMode) {

            // The task is already in split-screen and with correct windowing mode.

            return true;

        }



        moveTaskToSplitScreenPrimaryTask(task, toTop);

        return prevMode != task.getWindowingMode();

    }