Merge "Don't wait for client completePause when sleeping" into main (1516b90a) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -10355,7 +10355,9 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		}
		if (!isVisibleRequested()) {
		// TODO(b/294925498): Remove this finishing check once we have accurate ready tracking.
		if (task != null && task.getPausingActivity() == this) {
		if (task != null && task.getPausingActivity() == this
		// Display is asleep, so nothing will be visible anyways.
		&& !mDisplayContent.isSleeping()) {
		// Visibility of starting activities isn't calculated until pause-complete, so if
		// this is not paused yet, don't consider it ready.
		return false;