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

Commit c6674749 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am b9b62b06: am 52656916: am 4c101015: Merge "Avoid to skip app window due to... 

am b9b62b06: am 52656916: am 4c101015: Merge "Avoid to skip app window due to un-assigned sending to bottom state while app window sort"

* commit 'b9b62b06':
  Avoid to skip app window due to un-assigned sending to bottom state while app window sort
parents 6b6a4873 b9b62b06

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ class Task { 
        return removed;

    }



    void setSendingToBottom(boolean toBottom) {

        for (int appTokenNdx = 0; appTokenNdx < mAppTokens.size(); appTokenNdx++) {

            mAppTokens.get(appTokenNdx).sendingToBottom = toBottom;

        }

    }



    @Override

    public String toString() {

        return "{taskId=" + taskId + " appTokens=" + mAppTokens + "}";

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

+6 −0
Original line number Diff line number Diff line
@@ -5052,6 +5052,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }

                stack.moveTaskToTop(task);

                if (mAppTransition.isTransitionSet()) {

                    task.setSendingToBottom(false);

                }

            }

        } finally {

            Binder.restoreCallingIdentity(origId);
@@ -5070,6 +5073,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                final TaskStack stack = task.mStack;

                stack.moveTaskToBottom(task);

                if (mAppTransition.isTransitionSet()) {

                    task.setSendingToBottom(true);

                }

                moveStackWindowsLocked(stack.getDisplayContent());

            }

        } finally {