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

Commit 1e68575d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Request transition when PIP is removed" into udc-qpr-dev

parents b2c12cea 20f56747

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

+2 −1
Original line number Diff line number Diff line
@@ -2201,7 +2201,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
            displaySwapping |= s.isDisplaySleepingAndSwapping();

            ProtoLog.v(WM_DEBUG_STATES, "Stopping %s: nowVisible=%b animating=%b "

                    + "finishing=%s", s, s.nowVisible, animating, s.finishing);

            if ((!animating && !displaySwapping) || mService.mShuttingDown) {

            if ((!animating && !displaySwapping) || mService.mShuttingDown

                    || s.getRootTask().isForceHiddenForPinnedTask()) {

                if (!processPausingActivities && s.isState(PAUSING)) {

                    // Defer processing pausing activities in this iteration and reschedule

                    // a delayed idle to reprocess it again

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

+4 −0
Original line number Diff line number Diff line
@@ -4504,6 +4504,10 @@ class Task extends TaskFragment { 
        return mForceHiddenFlags != 0;

    }



    boolean isForceHiddenForPinnedTask() {

        return (mForceHiddenFlags & FLAG_FORCE_HIDDEN_FOR_PINNED_TASK) != 0;

    }



    @Override

    protected boolean isForceTranslucent() {

        return mForceTranslucent;