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

Commit 020c03aa authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix ANR for real"

parents a620aa1a 067b5bf1

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

+7 −8
Original line number Original line Diff line number Diff line
@@ -367,15 +367,14 @@ public class AppWindowContainerController 
                    if (wtoken.isHidden()) {

                    if (wtoken.isHidden()) {

                        wtoken.waitingToShow = true;

                        wtoken.waitingToShow = true;

                    }

                    }

                }





                    if (wtoken.isClientHidden()) {

                // In the case where we are making an app visible but holding off for a transition,

                        // In the case where we are making an app visible but holding off for a

                // we still need to tell the client to make its windows visible so they get drawn.

                        // transition, we still need to tell the client to make its windows visible

                // Otherwise, we will wait on performing the transition until all windows have been

                        // so they get drawn. Otherwise, we will wait on performing the transition

                // drawn, they never will be, and we are sad.

                        // until all windows have been drawn, they never will be, and we are sad.

                wtoken.setClientHidden(false);

                wtoken.setClientHidden(false);

                    }



                }

                wtoken.requestUpdateWallpaperIfNeeded();

                wtoken.requestUpdateWallpaperIfNeeded();





                if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "No longer Stopped: " + wtoken);

                if (DEBUG_ADD_REMOVE) Slog.v(TAG_WM, "No longer Stopped: " + wtoken);

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -367,6 +367,8 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        if (mClientHidden == hideClient || (hideClient && mDeferHidingClient)) {

        if (mClientHidden == hideClient || (hideClient && mDeferHidingClient)) {

            return;

            return;

        }

        }

        if (DEBUG_APP_TRANSITIONS) Slog.v(TAG_WM, "setClientHidden: " + this

                + " clientHidden=" + hideClient + " Callers=" + Debug.getCallers(5));

        mClientHidden = hideClient;

        mClientHidden = hideClient;

        sendAppVisibilityToClients();

        sendAppVisibilityToClients();

    }

    }