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

Commit a1a2c66e authored by Gopal G Goberu's avatar Gopal G Goberu
Browse files

Merge commit '716c5bcc' into HEAD 

Conflicts:
	core/res/res/values-zh-rTW/strings.xml

Change-Id: If6b6719b7d53287d5d103f28dffe6967d6992d60
parents 8e3565e5 716c5bcc

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

+6 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    private static final String SIZE_OVERRIDE = "ro.config.size_override";



    private static final int MAX_SCREENSHOT_RETRIES = 3;

    private static final int WINDOW_EXITING_TIME_OUT = 6000;



    // The flag describing a full screen app window (where the app takes care of drawing under the

    // SystemUI bars)
@@ -9825,6 +9826,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                final int N = windows.size();

                for (i=N-1; i>=0; i--) {

                    WindowState w = windows.get(i);

		    if(w.mExiting && (w.mLastFreezeDuration > WINDOW_EXITING_TIME_OUT)

                        && w.mInputChannel == null) {

                        removeWindowInnerLocked(w.mSession, w);

                    }



                    final TaskStack stack = w.getStack();

                    if (stack == null && w.getAttrs().type != TYPE_PRIVATE_PRESENTATION) {

                        continue;