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

Commit 6e96f047 authored Jul 30, 2021 by Chris Li Committed by Automerger Merge Worker Jul 30, 2021

Merge "Do not call setReady(false) when finishing" into sc-v2-dev am: d31dbcf1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15404739

Change-Id: I2bcf07a8b5103b4295d19cd907e656b4841115b2

parents b32575b9 d31dbcf1

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -3453,8 +3453,14 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		if (stopped) {
		abortAndClearOptionsAnimation();
		}
		if (mAtmService.getTransitionController().isCollecting()) {
		// We don't want the finishing to change the transition ready state since there will not
		// be corresponding setReady for finishing.
		mAtmService.getTransitionController().collectExistenceChange(this);
		} else {
		mAtmService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, this);
		}
		}

		/**
		* This method is to only be called from the client via binder when the activity is destroyed

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -1551,7 +1551,13 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		return;
		}
		if (task.isVisible()) {
		if (mService.getTransitionController().isCollecting()) {
		// We don't want the finishing to change the transition ready state since there will
		// not be corresponding setReady for finishing.
		mService.getTransitionController().collectExistenceChange(task);
		} else {
		mService.getTransitionController().requestTransitionIfNeeded(TRANSIT_CLOSE, task);
		}
		} else {
		// Removing a non-visible task doesn't require a transition, but if there is one
		// collecting, this should be a member just in case.