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

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

Merge "Catch a missed case when adding a toast"

parents 4784f14a 200adfbe

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

+1 −2
Original line number Diff line number Diff line
@@ -1122,8 +1122,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
        for (int i = 0; i < windowCount; i++) {

            final WindowState window = mWindows.get(i);

            if (window.mAttrs.type == TYPE_TOAST && window.mOwnerUid == uid

                    && !window.mPermanentlyHidden && !window.mAnimatingExit

                    && !window.mRemoveOnExit) {

                    && !window.mPermanentlyHidden && !window.mWindowRemovalAllowed) {

                return false;

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
     * or some other higher level component said so (e.g. activity manager).

     * TODO: We should either have different booleans for the removal reason or use a bit-field.

     */

    private boolean mWindowRemovalAllowed;

    boolean mWindowRemovalAllowed;



    /**

     * Temp for keeping track of windows that have been removed when