Merge "Fix TaskFragment pending event not dispatch" into tm-dev (eb0cb0b4) · Commits · e / os / android_frameworks_base

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,12 @@ class TaskFragment extends WindowContainer<WindowContainer> {
		Slog.d(TAG, "setResumedActivity taskFrag:" + this + " + from: "
		+ mResumedActivity + " to:" + r + " reason:" + reason);
		}

		if (r != null && mResumedActivity == null) {
		// Task is becoming active.
		getTask().touchActiveTime();
		}

		final ActivityRecord prevR = mResumedActivity;
		mResumedActivity = r;
		mTaskSupervisor.updateTopResumedActivityIfNeeded();

+34 −0

Original line number	Diff line number	Diff line
		@@ -484,6 +484,40 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
		verify(mOrganizer, never()).onTaskFragmentInfoChanged(any());
		}

		@Test
		public void testCanSendPendingTaskFragmentEventsAfterActivityResumed() {
		// Task - TaskFragment - Activity.
		final Task task = createTask(mDisplayContent);
		final TaskFragment taskFragment = new TaskFragmentBuilder(mAtm)
		.setParentTask(task)
		.setOrganizer(mOrganizer)
		.setFragmentToken(mFragmentToken)
		.createActivityCount(1)
		.build();
		final ActivityRecord activity = taskFragment.getTopMostActivity();

		// Mock the task to invisible
		doReturn(false).when(task).shouldBeVisible(any());
		taskFragment.setResumedActivity(null, "test");

		// Sending events
		mController.registerOrganizer(mIOrganizer);
		taskFragment.mTaskFragmentAppearedSent = true;
		mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment);
		mController.dispatchPendingEvents();

		// Verifies that event was not sent
		verify(mOrganizer, never()).onTaskFragmentInfoChanged(any());

		// Mock the task becomes visible, and activity resumed
		doReturn(true).when(task).shouldBeVisible(any());
		taskFragment.setResumedActivity(activity, "test");

		// Verifies that event is sent.
		mController.dispatchPendingEvents();
		verify(mOrganizer).onTaskFragmentInfoChanged(any());
		}

		/**
		* Tests that a task fragment info changed event is still sent if the task is invisible only
		* when the info changed event is because of the last activity in a task finishing.