Merge "Fix gmail flicker issue in split screen" into tm-qpr-dev (f3e2db05) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -1165,8 +1165,16 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		}

		next.delayedResume = false;
		final TaskDisplayArea taskDisplayArea = getDisplayArea();

		// If we are currently pausing an activity, then don't do anything until that is done.
		final boolean allPausedComplete = mRootWindowContainer.allPausedActivitiesComplete();
		if (!allPausedComplete) {
		ProtoLog.v(WM_DEBUG_STATES,
		"resumeTopActivity: Skip resume: some activity pausing.");
		return false;
		}

		final TaskDisplayArea taskDisplayArea = getDisplayArea();
		// If the top activity is the resumed one, nothing to do.
		if (mResumedActivity == next && next.isState(RESUMED)
		&& taskDisplayArea.allResumedActivitiesComplete()) {
		@@ -1189,14 +1197,6 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		return false;
		}

		// If we are currently pausing an activity, then don't do anything until that is done.
		final boolean allPausedComplete = mRootWindowContainer.allPausedActivitiesComplete();
		if (!allPausedComplete) {
		ProtoLog.v(WM_DEBUG_STATES,
		"resumeTopActivity: Skip resume: some activity pausing.");
		return false;
		}

		// If we are sleeping, and there is no resumed activity, and the top activity is paused,
		// well that is the state we want.
		if (mLastPausedActivity == next && shouldSleepOrShutDownActivities()) {