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

Commit a353581c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #3344089: runtime restart due to java.lang.StackOverflowError..." into honeycomb

parents 2e0c5261 2e7ffa54

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

+22 −17
Original line number Diff line number Diff line
@@ -9216,7 +9216,10 @@ public class WindowManagerService extends IWindowManager.Stub 
            return;

        }



        mInLayout = true;

        boolean recoveringMemory = false;

        

        try {

            if (mForceRemoves != null) {

                recoveringMemory = true;

                // Wait a little it for things to settle down, and off we go.
@@ -9235,8 +9238,10 @@ public class WindowManagerService extends IWindowManager.Stub 
                    }

                }

            }

        } catch (RuntimeException e) {

            Slog.e(TAG, "Unhandled exception while force removing for memory", e);

        }

        

        mInLayout = true;

        try {

            performLayoutAndPlaceSurfacesLockedInner(recoveringMemory);