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

Commit b89cd360 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge \"Reset relaunching count is app dies during re-launch\" into nyc-mr1-dev 

am: 45f8aaca

Change-Id: I4de3c56e1745371c453f983e95d49a7c59a3c694
parents 17a527f2 45f8aaca

services/core/java/com/android/server/am/ActivityStack.java

+4 −0
Original line number Diff line number Diff line
@@ -3759,6 +3759,10 @@ final class ActivityStack { 
        if (getVisibleBehindActivity() == r) {

            mStackSupervisor.requestVisibleBehindLocked(r, false);

        }



        // Clean-up activities are no longer relaunching (e.g. app process died). Notify window

        // manager so it can update its bookkeeping.

        mWindowManager.notifyAppRelaunchesCleared(r.appToken);

    }



    private void removeTimeoutsForActivityLocked(ActivityRecord r) {

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

+7 −0
Original line number Diff line number Diff line
@@ -625,6 +625,13 @@ class AppWindowToken extends WindowToken { 
        }

    }



    void clearRelaunching() {

        if (canFreezeBounds()) {

            unfreezeBounds();

        }

        mPendingRelaunchCount = 0;

    }



    void addWindow(WindowState w) {

        for (int i = allAppWindows.size() - 1; i >= 0; i--) {

            WindowState candidate = allAppWindows.get(i);

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

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

    }



    public void notifyAppRelaunchesCleared(IBinder token) {

        synchronized (mWindowMap) {

            final AppWindowToken appWindow = findAppWindowToken(token);

            if (appWindow != null) {

                appWindow.clearRelaunching();

            }

        }

    }



    @Override

    public int getDockedDividerInsetsLw() {

        return getDefaultDisplayContentLocked().getDockedDividerController().getContentInsets();