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

Commit 8fd75428 authored Jun 24, 2016 by Wale Ogunwale

Reset relaunching count is app dies during re-launch

WindowManager keeps a count of how many relaunches an app is told
to do so that it can defer app transtions until the relaunches are
done. If the app porcess is killed during one of the relaunches
the app will never report back that it is done relaunching, so
app transtions into the app will not happen until will timeout
from waiting for the app.
We now notify WM of this situation so it can clear the relaunching
count for the app.

Bug: 29551109
Change-Id: Ibadba9f73e6e1bde141385aa8a0e066fbc0c5764

parent 90b2c781

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();