Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Apply TaskFragmentOrganizer changes in one WCT (2/2)" into tm-qpr-dev

Browse Source
This commit is contained in:
Chris Li
2022-08-21 02:07:04 +00:00
committed by Android (Google) Code Review
parent 7811c2b731 660101fdc7
commit f215542792
4 changed files with 138 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/api/test-current.txt
View File

@@ -3349,12 +3349,17 @@ package android.window {
ctor public TaskFragmentOrganizer(@NonNull java.util.concurrent.Executor); ctor public TaskFragmentOrganizer(@NonNull java.util.concurrent.Executor);
method @NonNull public java.util.concurrent.Executor getExecutor(); method @NonNull public java.util.concurrent.Executor getExecutor();
method @NonNull public android.window.TaskFragmentOrganizerToken getOrganizerToken(); method @NonNull public android.window.TaskFragmentOrganizerToken getOrganizerToken();
method public void onTaskFragmentAppeared(@NonNull android.window.TaskFragmentInfo); method public void onActivityReparentedToTask(@NonNull android.window.WindowContainerTransaction, int, @NonNull android.content.Intent, @NonNull android.os.IBinder);
method @Deprecated public void onTaskFragmentAppeared(@NonNull android.window.TaskFragmentInfo);
method public void onTaskFragmentAppeared(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.TaskFragmentInfo);
method @Deprecated public void onTaskFragmentError(@NonNull android.os.IBinder, @NonNull Throwable); method @Deprecated public void onTaskFragmentError(@NonNull android.os.IBinder, @NonNull Throwable);
method public void onTaskFragmentError(@NonNull android.os.IBinder, @Nullable android.window.TaskFragmentInfo, int, @NonNull Throwable); method public void onTaskFragmentError(@NonNull android.window.WindowContainerTransaction, @NonNull android.os.IBinder, @Nullable android.window.TaskFragmentInfo, int, @NonNull Throwable);
method public void onTaskFragmentInfoChanged(@NonNull android.window.TaskFragmentInfo); method @Deprecated public void onTaskFragmentInfoChanged(@NonNull android.window.TaskFragmentInfo);
method public void onTaskFragmentParentInfoChanged(@NonNull android.os.IBinder, @NonNull android.content.res.Configuration); method public void onTaskFragmentInfoChanged(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.TaskFragmentInfo);
method public void onTaskFragmentVanished(@NonNull android.window.TaskFragmentInfo); method @Deprecated public void onTaskFragmentParentInfoChanged(@NonNull android.os.IBinder, @NonNull android.content.res.Configuration);
method public void onTaskFragmentParentInfoChanged(@NonNull android.window.WindowContainerTransaction, int, @NonNull android.content.res.Configuration);
method @Deprecated public void onTaskFragmentVanished(@NonNull android.window.TaskFragmentInfo);
method public void onTaskFragmentVanished(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.TaskFragmentInfo);
method @CallSuper public void registerOrganizer(); method @CallSuper public void registerOrganizer();
method @CallSuper public void unregisterOrganizer(); method @CallSuper public void unregisterOrganizer();
} }

95
core/java/android/window/TaskFragmentOrganizer.java
View File

@@ -26,6 +26,7 @@ import static android.window.TaskFragmentTransaction.TYPE_TASK_FRAGMENT_VANISHED
import android.annotation.CallSuper; import android.annotation.CallSuper;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
@@ -151,23 +152,71 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* Called when a TaskFragment is created and organized by this organizer. * Called when a TaskFragment is created and organized by this organizer.
* *
* @param taskFragmentInfo Info of the TaskFragment that is created. * @param taskFragmentInfo Info of the TaskFragment that is created.
* @deprecated Use {@link #onTaskFragmentAppeared(WindowContainerTransaction, TaskFragmentInfo)}
* instead.
*/ */
@Deprecated
public void onTaskFragmentAppeared(@NonNull TaskFragmentInfo taskFragmentInfo) {} public void onTaskFragmentAppeared(@NonNull TaskFragmentInfo taskFragmentInfo) {}
/**
* Called when a TaskFragment is created and organized by this organizer.
*
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param taskFragmentInfo Info of the TaskFragment that is created.
*/
public void onTaskFragmentAppeared(@NonNull WindowContainerTransaction wct,
@NonNull TaskFragmentInfo taskFragmentInfo) {
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next release.
onTaskFragmentAppeared(taskFragmentInfo);
}
/** /**
* Called when the status of an organized TaskFragment is changed. * Called when the status of an organized TaskFragment is changed.
* *
* @param taskFragmentInfo Info of the TaskFragment that is changed. * @param taskFragmentInfo Info of the TaskFragment that is changed.
* @deprecated Use {@link #onTaskFragmentInfoChanged(WindowContainerTransaction,
* TaskFragmentInfo)} instead.
*/ */
@Deprecated
public void onTaskFragmentInfoChanged(@NonNull TaskFragmentInfo taskFragmentInfo) {} public void onTaskFragmentInfoChanged(@NonNull TaskFragmentInfo taskFragmentInfo) {}
/**
* Called when the status of an organized TaskFragment is changed.
*
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param taskFragmentInfo Info of the TaskFragment that is changed.
*/
public void onTaskFragmentInfoChanged(@NonNull WindowContainerTransaction wct,
@NonNull TaskFragmentInfo taskFragmentInfo) {
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next release.
onTaskFragmentInfoChanged(taskFragmentInfo);
}
/** /**
* Called when an organized TaskFragment is removed. * Called when an organized TaskFragment is removed.
* *
* @param taskFragmentInfo Info of the TaskFragment that is removed. * @param taskFragmentInfo Info of the TaskFragment that is removed.
* @deprecated Use {@link #onTaskFragmentVanished(WindowContainerTransaction,
* TaskFragmentInfo)} instead.
*/ */
@Deprecated
public void onTaskFragmentVanished(@NonNull TaskFragmentInfo taskFragmentInfo) {} public void onTaskFragmentVanished(@NonNull TaskFragmentInfo taskFragmentInfo) {}
/**
* Called when an organized TaskFragment is removed.
*
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param taskFragmentInfo Info of the TaskFragment that is removed.
*/
public void onTaskFragmentVanished(@NonNull WindowContainerTransaction wct,
@NonNull TaskFragmentInfo taskFragmentInfo) {
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next release.
onTaskFragmentVanished(taskFragmentInfo);
}
/** /**
* Called when the parent leaf Task of organized TaskFragments is changed. * Called when the parent leaf Task of organized TaskFragments is changed.
* When the leaf Task is changed, the organizer may want to update the TaskFragments in one * When the leaf Task is changed, the organizer may want to update the TaskFragments in one
@@ -176,7 +225,13 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* For case like screen size change, it will trigger onTaskFragmentParentInfoChanged with new * For case like screen size change, it will trigger onTaskFragmentParentInfoChanged with new
* Task bounds, but may not trigger onTaskFragmentInfoChanged because there can be an override * Task bounds, but may not trigger onTaskFragmentInfoChanged because there can be an override
* bounds. * bounds.
*
* @param fragmentToken The parent Task this TaskFragment is changed.
* @param parentConfig Config of the parent Task.
* @deprecated Use {@link #onTaskFragmentParentInfoChanged(WindowContainerTransaction, int,
* Configuration)} instead.
*/ */
@Deprecated
public void onTaskFragmentParentInfoChanged( public void onTaskFragmentParentInfoChanged(
@NonNull IBinder fragmentToken, @NonNull Configuration parentConfig) {} @NonNull IBinder fragmentToken, @NonNull Configuration parentConfig) {}
@@ -189,11 +244,13 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* Task bounds, but may not trigger onTaskFragmentInfoChanged because there can be an override * Task bounds, but may not trigger onTaskFragmentInfoChanged because there can be an override
* bounds. * bounds.
* *
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param taskId Id of the parent Task that is changed. * @param taskId Id of the parent Task that is changed.
* @param parentConfig Config of the parent Task. * @param parentConfig Config of the parent Task.
* @hide
*/ */
public void onTaskFragmentParentInfoChanged(int taskId, @NonNull Configuration parentConfig) { public void onTaskFragmentParentInfoChanged(@NonNull WindowContainerTransaction wct, int taskId,
@NonNull Configuration parentConfig) {
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next release. // TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next release.
final List<IBinder> tokens = mTaskIdToFragmentTokens.get(taskId); final List<IBinder> tokens = mTaskIdToFragmentTokens.get(taskId);
if (tokens == null || tokens.isEmpty()) { if (tokens == null || tokens.isEmpty()) {
@@ -211,9 +268,8 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* @param errorCallbackToken token set in * @param errorCallbackToken token set in
* {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)}
* @param exception exception from the server side. * @param exception exception from the server side.
* * @deprecated Use {@link #onTaskFragmentError(WindowContainerTransaction, IBinder,
* @deprecated Use {@link #onTaskFragmentError(IBinder, TaskFragmentInfo, int, Throwable)} * TaskFragmentInfo, int, Throwable)} instead.
* instead.
*/ */
@Deprecated @Deprecated
public void onTaskFragmentError( public void onTaskFragmentError(
@@ -223,6 +279,8 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* Called when the {@link WindowContainerTransaction} created with * Called when the {@link WindowContainerTransaction} created with
* {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} failed on the server side. * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} failed on the server side.
* *
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param errorCallbackToken token set in * @param errorCallbackToken token set in
* {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)} * {@link WindowContainerTransaction#setErrorCallbackToken(IBinder)}
* @param taskFragmentInfo The {@link TaskFragmentInfo}. This could be {@code null} if no * @param taskFragmentInfo The {@link TaskFragmentInfo}. This could be {@code null} if no
@@ -231,7 +289,7 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* transaction operation. * transaction operation.
* @param exception exception from the server side. * @param exception exception from the server side.
*/ */
public void onTaskFragmentError( public void onTaskFragmentError(@NonNull WindowContainerTransaction wct,
@NonNull IBinder errorCallbackToken, @Nullable TaskFragmentInfo taskFragmentInfo, @NonNull IBinder errorCallbackToken, @Nullable TaskFragmentInfo taskFragmentInfo,
int opType, @NonNull Throwable exception) { int opType, @NonNull Throwable exception) {
// Doing so to keep compatibility. This will be removed in the next release. // Doing so to keep compatibility. This will be removed in the next release.
@@ -244,6 +302,8 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* original Task. In this case, we need to notify the organizer so that it can check if the * original Task. In this case, we need to notify the organizer so that it can check if the
* Activity matches any split rule. * Activity matches any split rule.
* *
* @param wct The {@link WindowContainerTransaction} to make any changes with if needed. No
* need to call {@link #applyTransaction} as it will be applied by the caller.
* @param taskId The Task that the activity is reparented to. * @param taskId The Task that the activity is reparented to.
* @param activityIntent The intent that the activity is original launched with. * @param activityIntent The intent that the activity is original launched with.
* @param activityToken If the activity belongs to the same process as the organizer, this * @param activityToken If the activity belongs to the same process as the organizer, this
@@ -251,20 +311,23 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
* different process, the server will generate a temporary token that * different process, the server will generate a temporary token that
* the organizer can use to reparent the activity through * the organizer can use to reparent the activity through
* {@link WindowContainerTransaction} if needed. * {@link WindowContainerTransaction} if needed.
* @hide
*/ */
public void onActivityReparentedToTask(int taskId, @NonNull Intent activityIntent, public void onActivityReparentedToTask(@NonNull WindowContainerTransaction wct,
@NonNull IBinder activityToken) {} int taskId, @NonNull Intent activityIntent, @NonNull IBinder activityToken) {}
/** /**
* Called when the transaction is ready so that the organizer can update the TaskFragments based * Called when the transaction is ready so that the organizer can update the TaskFragments based
* on the changes in transaction. * on the changes in transaction.
* Note: {@link WindowOrganizer#applyTransaction} permission requirement is conditional for
* {@link TaskFragmentOrganizer}.
* @see com.android.server.wm.WindowOrganizerController#enforceTaskPermission
* @hide * @hide
*/ */
@SuppressLint("AndroidFrameworkRequiresPermission")
public void onTransactionReady(@NonNull TaskFragmentTransaction transaction) { public void onTransactionReady(@NonNull TaskFragmentTransaction transaction) {
final WindowContainerTransaction wct = new WindowContainerTransaction();
final List<TaskFragmentTransaction.Change> changes = transaction.getChanges(); final List<TaskFragmentTransaction.Change> changes = transaction.getChanges();
for (TaskFragmentTransaction.Change change : changes) { for (TaskFragmentTransaction.Change change : changes) {
// TODO(b/240519866): apply all changes in one WCT.
final int taskId = change.getTaskId(); final int taskId = change.getTaskId();
switch (change.getType()) { switch (change.getType()) {
case TYPE_TASK_FRAGMENT_APPEARED: case TYPE_TASK_FRAGMENT_APPEARED:
@@ -277,10 +340,10 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
onTaskFragmentParentInfoChanged(change.getTaskFragmentToken(), onTaskFragmentParentInfoChanged(change.getTaskFragmentToken(),
mTaskIdToConfigurations.get(taskId)); mTaskIdToConfigurations.get(taskId));
onTaskFragmentAppeared(change.getTaskFragmentInfo()); onTaskFragmentAppeared(wct, change.getTaskFragmentInfo());
break; break;
case TYPE_TASK_FRAGMENT_INFO_CHANGED: case TYPE_TASK_FRAGMENT_INFO_CHANGED:
onTaskFragmentInfoChanged(change.getTaskFragmentInfo()); onTaskFragmentInfoChanged(wct, change.getTaskFragmentInfo());
break; break;
case TYPE_TASK_FRAGMENT_VANISHED: case TYPE_TASK_FRAGMENT_VANISHED:
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next // TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next
@@ -294,18 +357,19 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
} }
} }
onTaskFragmentVanished(change.getTaskFragmentInfo()); onTaskFragmentVanished(wct, change.getTaskFragmentInfo());
break; break;
case TYPE_TASK_FRAGMENT_PARENT_INFO_CHANGED: case TYPE_TASK_FRAGMENT_PARENT_INFO_CHANGED:
// TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next // TODO(b/240519866): doing so to keep CTS compatibility. Remove in the next
// release. // release.
mTaskIdToConfigurations.put(taskId, change.getTaskConfiguration()); mTaskIdToConfigurations.put(taskId, change.getTaskConfiguration());
onTaskFragmentParentInfoChanged(taskId, change.getTaskConfiguration()); onTaskFragmentParentInfoChanged(wct, taskId, change.getTaskConfiguration());
break; break;
case TYPE_TASK_FRAGMENT_ERROR: case TYPE_TASK_FRAGMENT_ERROR:
final Bundle errorBundle = change.getErrorBundle(); final Bundle errorBundle = change.getErrorBundle();
onTaskFragmentError( onTaskFragmentError(
wct,
change.getErrorCallbackToken(), change.getErrorCallbackToken(),
errorBundle.getParcelable( errorBundle.getParcelable(
KEY_ERROR_CALLBACK_TASK_FRAGMENT_INFO, TaskFragmentInfo.class), KEY_ERROR_CALLBACK_TASK_FRAGMENT_INFO, TaskFragmentInfo.class),
@@ -315,6 +379,7 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
break; break;
case TYPE_ACTIVITY_REPARENTED_TO_TASK: case TYPE_ACTIVITY_REPARENTED_TO_TASK:
onActivityReparentedToTask( onActivityReparentedToTask(
wct,
change.getTaskId(), change.getTaskId(),
change.getActivityIntent(), change.getActivityIntent(),
change.getActivityToken()); change.getActivityToken());
@@ -324,6 +389,8 @@ public class TaskFragmentOrganizer extends WindowOrganizer {
"Unknown TaskFragmentEvent=" + change.getType()); "Unknown TaskFragmentEvent=" + change.getType());
} }
} }
// TODO(b/240519866): notify TaskFragmentOrganizerController that the transition is done.
applyTransaction(wct);
} }
@Override @Override

31
libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/JetpackTaskFragmentOrganizer.java
View File

@@ -271,56 +271,49 @@ class JetpackTaskFragmentOrganizer extends TaskFragmentOrganizer {
} }
@Override @Override
public void onTaskFragmentAppeared(@NonNull TaskFragmentInfo taskFragmentInfo) { public void onTaskFragmentAppeared(@NonNull WindowContainerTransaction wct,
final WindowContainerTransaction wct = new WindowContainerTransaction(); @NonNull TaskFragmentInfo taskFragmentInfo) {
final IBinder fragmentToken = taskFragmentInfo.getFragmentToken(); final IBinder fragmentToken = taskFragmentInfo.getFragmentToken();
mFragmentInfos.put(fragmentToken, taskFragmentInfo); mFragmentInfos.put(fragmentToken, taskFragmentInfo);
mCallback.onTaskFragmentAppeared(wct, taskFragmentInfo); mCallback.onTaskFragmentAppeared(wct, taskFragmentInfo);
applyTransaction(wct);
} }
@Override @Override
public void onTaskFragmentInfoChanged(@NonNull TaskFragmentInfo taskFragmentInfo) { public void onTaskFragmentInfoChanged(@NonNull WindowContainerTransaction wct,
final WindowContainerTransaction wct = new WindowContainerTransaction(); @NonNull TaskFragmentInfo taskFragmentInfo) {
final IBinder fragmentToken = taskFragmentInfo.getFragmentToken(); final IBinder fragmentToken = taskFragmentInfo.getFragmentToken();
mFragmentInfos.put(fragmentToken, taskFragmentInfo); mFragmentInfos.put(fragmentToken, taskFragmentInfo);
mCallback.onTaskFragmentInfoChanged(wct, taskFragmentInfo); mCallback.onTaskFragmentInfoChanged(wct, taskFragmentInfo);
applyTransaction(wct);
} }
@Override @Override
public void onTaskFragmentVanished(@NonNull TaskFragmentInfo taskFragmentInfo) { public void onTaskFragmentVanished(@NonNull WindowContainerTransaction wct,
final WindowContainerTransaction wct = new WindowContainerTransaction(); @NonNull TaskFragmentInfo taskFragmentInfo) {
mFragmentInfos.remove(taskFragmentInfo.getFragmentToken()); mFragmentInfos.remove(taskFragmentInfo.getFragmentToken());
mCallback.onTaskFragmentVanished(wct, taskFragmentInfo); mCallback.onTaskFragmentVanished(wct, taskFragmentInfo);
applyTransaction(wct);
} }
@Override @Override
public void onTaskFragmentParentInfoChanged(int taskId, @NonNull Configuration parentConfig) { public void onTaskFragmentParentInfoChanged(@NonNull WindowContainerTransaction wct,
final WindowContainerTransaction wct = new WindowContainerTransaction(); int taskId, @NonNull Configuration parentConfig) {
mCallback.onTaskFragmentParentInfoChanged(wct, taskId, parentConfig); mCallback.onTaskFragmentParentInfoChanged(wct, taskId, parentConfig);
applyTransaction(wct);
} }
@Override @Override
public void onActivityReparentedToTask(int taskId, @NonNull Intent activityIntent, public void onActivityReparentedToTask(@NonNull WindowContainerTransaction wct,
@NonNull IBinder activityToken) { int taskId, @NonNull Intent activityIntent, @NonNull IBinder activityToken) {
final WindowContainerTransaction wct = new WindowContainerTransaction();
mCallback.onActivityReparentedToTask(wct, taskId, activityIntent, activityToken); mCallback.onActivityReparentedToTask(wct, taskId, activityIntent, activityToken);
applyTransaction(wct);
} }
@Override @Override
public void onTaskFragmentError(@NonNull IBinder errorCallbackToken, public void onTaskFragmentError(@NonNull WindowContainerTransaction wct,
@NonNull IBinder errorCallbackToken,
@Nullable TaskFragmentInfo taskFragmentInfo, @Nullable TaskFragmentInfo taskFragmentInfo,
int opType, @NonNull Throwable exception) { int opType, @NonNull Throwable exception) {
final WindowContainerTransaction wct = new WindowContainerTransaction();
if (taskFragmentInfo != null) { if (taskFragmentInfo != null) {
final IBinder fragmentToken = taskFragmentInfo.getFragmentToken(); final IBinder fragmentToken = taskFragmentInfo.getFragmentToken();
mFragmentInfos.put(fragmentToken, taskFragmentInfo); mFragmentInfos.put(fragmentToken, taskFragmentInfo);
} }
mCallback.onTaskFragmentError(wct, taskFragmentInfo, opType); mCallback.onTaskFragmentError(wct, taskFragmentInfo, opType);
applyTransaction(wct);
} }
} }

70
services/tests/wmtests/src/com/android/server/wm/TaskFragmentOrganizerControllerTest.java
View File

@@ -158,7 +158,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentAppeared(any()); verify(mOrganizer, never()).onTaskFragmentAppeared(any(), any());
// Send callback when the TaskFragment is attached. // Send callback when the TaskFragment is attached.
setupMockParent(mTaskFragment, mTask); setupMockParent(mTaskFragment, mTask);
@@ -166,7 +166,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentAppeared(any()); verify(mOrganizer).onTaskFragmentAppeared(any(), any());
} }
@Test @Test
@@ -179,13 +179,13 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment); mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
// Call onTaskFragmentAppeared first. // Call onTaskFragmentAppeared first.
mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentAppeared(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentAppeared(any()); verify(mOrganizer).onTaskFragmentAppeared(any(), any());
// No callback if the info is not changed. // No callback if the info is not changed.
doReturn(true).when(mTaskFragmentInfo).equalsForTaskFragmentOrganizer(any()); doReturn(true).when(mTaskFragmentInfo).equalsForTaskFragmentOrganizer(any());
@@ -195,7 +195,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment); mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
// Trigger callback if the info is changed. // Trigger callback if the info is changed.
doReturn(false).when(mTaskFragmentInfo).equalsForTaskFragmentOrganizer(any()); doReturn(false).when(mTaskFragmentInfo).equalsForTaskFragmentOrganizer(any());
@@ -204,7 +204,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment); mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentInfoChanged(eq(mTaskFragmentInfo)); verify(mOrganizer).onTaskFragmentInfoChanged(any(), eq(mTaskFragmentInfo));
} }
@Test @Test
@@ -215,7 +215,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentVanished(any()); verify(mOrganizer).onTaskFragmentVanished(any(), any());
} }
@Test @Test
@@ -228,10 +228,10 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentAppeared(any()); verify(mOrganizer, never()).onTaskFragmentAppeared(any(), any());
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(anyInt(), any()); verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(any(), anyInt(), any());
verify(mOrganizer).onTaskFragmentVanished(eq(mTaskFragmentInfo)); verify(mOrganizer).onTaskFragmentVanished(any(), eq(mTaskFragmentInfo));
// Not trigger onTaskFragmentInfoChanged. // Not trigger onTaskFragmentInfoChanged.
// Call onTaskFragmentAppeared before calling onTaskFragmentInfoChanged. // Call onTaskFragmentAppeared before calling onTaskFragmentInfoChanged.
@@ -244,10 +244,10 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mController.onTaskFragmentVanished(mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentAppeared(any()); verify(mOrganizer, never()).onTaskFragmentAppeared(any(), any());
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(anyInt(), any()); verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(any(), anyInt(), any());
verify(mOrganizer).onTaskFragmentVanished(eq(mTaskFragmentInfo)); verify(mOrganizer).onTaskFragmentVanished(any(), eq(mTaskFragmentInfo));
} }
@Test @Test
@@ -260,7 +260,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentParentInfoChanged(eq(mTask.mTaskId), any()); verify(mOrganizer).onTaskFragmentParentInfoChanged(any(), eq(mTask.mTaskId), any());
// No extra callback if the info is not changed. // No extra callback if the info is not changed.
clearInvocations(mOrganizer); clearInvocations(mOrganizer);
@@ -269,7 +269,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(anyInt(), any()); verify(mOrganizer, never()).onTaskFragmentParentInfoChanged(any(), anyInt(), any());
// Trigger callback if the size is changed. // Trigger callback if the size is changed.
mTask.getConfiguration().smallestScreenWidthDp = 100; mTask.getConfiguration().smallestScreenWidthDp = 100;
@@ -277,7 +277,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentParentInfoChanged(eq(mTask.mTaskId), any()); verify(mOrganizer).onTaskFragmentParentInfoChanged(any(), eq(mTask.mTaskId), any());
// Trigger callback if the windowing mode is changed. // Trigger callback if the windowing mode is changed.
clearInvocations(mOrganizer); clearInvocations(mOrganizer);
@@ -286,7 +286,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment); mTaskFragment.getTaskFragmentOrganizer(), mTaskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentParentInfoChanged(eq(mTask.mTaskId), any()); verify(mOrganizer).onTaskFragmentParentInfoChanged(any(), eq(mTask.mTaskId), any());
} }
@Test @Test
@@ -298,7 +298,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mErrorToken, null /* taskFragment */, -1 /* opType */, exception); mErrorToken, null /* taskFragment */, -1 /* opType */, exception);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), eq(null), eq(-1), verify(mOrganizer).onTaskFragmentError(any(), eq(mErrorToken), eq(null), eq(-1),
eq(exception)); eq(exception));
} }
@@ -318,14 +318,14 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.onActivityReparentedToTask(activity); mController.onActivityReparentedToTask(activity);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onActivityReparentedToTask(anyInt(), any(), any()); verify(mOrganizer, never()).onActivityReparentedToTask(any(), anyInt(), any(), any());
// Notify organizer if it was embedded before entered Pip. // Notify organizer if it was embedded before entered Pip.
activity.mLastTaskFragmentOrganizerBeforePip = mIOrganizer; activity.mLastTaskFragmentOrganizerBeforePip = mIOrganizer;
mController.onActivityReparentedToTask(activity); mController.onActivityReparentedToTask(activity);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onActivityReparentedToTask(eq(task.mTaskId), eq(activity.intent), verify(mOrganizer).onActivityReparentedToTask(any(), eq(task.mTaskId), eq(activity.intent),
eq(activity.token)); eq(activity.token));
// Notify organizer if there is any embedded in the Task. // Notify organizer if there is any embedded in the Task.
@@ -341,7 +341,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, times(2)) verify(mOrganizer, times(2))
.onActivityReparentedToTask(eq(task.mTaskId), eq(activity.intent), .onActivityReparentedToTask(any(), eq(task.mTaskId), eq(activity.intent),
eq(activity.token)); eq(activity.token));
} }
@@ -371,7 +371,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
// Allow organizer to reparent activity in other process using the temporary token. // Allow organizer to reparent activity in other process using the temporary token.
verify(mOrganizer).onActivityReparentedToTask(eq(task.mTaskId), eq(activity.intent), verify(mOrganizer).onActivityReparentedToTask(any(), eq(task.mTaskId), eq(activity.intent),
token.capture()); token.capture());
final IBinder temporaryToken = token.getValue(); final IBinder temporaryToken = token.getValue();
assertNotEquals(activity.token, temporaryToken); assertNotEquals(activity.token, temporaryToken);
@@ -801,7 +801,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
// Verifies that event was not sent // Verifies that event was not sent
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
} }
@Test @Test
@@ -827,7 +827,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
// Verifies that event was not sent // Verifies that event was not sent
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
// Mock the task becomes visible, and activity resumed // Mock the task becomes visible, and activity resumed
doReturn(true).when(task).shouldBeVisible(any()); doReturn(true).when(task).shouldBeVisible(any());
@@ -835,7 +835,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
// Verifies that event is sent. // Verifies that event is sent.
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentInfoChanged(any()); verify(mOrganizer).onTaskFragmentInfoChanged(any(), any());
} }
/** /**
@@ -869,7 +869,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
reset(mOrganizer); reset(mOrganizer);
mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment); mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentInfoChanged(any()); verify(mOrganizer).onTaskFragmentInfoChanged(any(), any());
} }
/** /**
@@ -887,8 +887,8 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
.createActivityCount(1) .createActivityCount(1)
.build(); .build();
final ActivityRecord embeddedActivity = taskFragment.getTopNonFinishingActivity(); final ActivityRecord embeddedActivity = taskFragment.getTopNonFinishingActivity();
// Add another activity in the Task so that it always contains a non-finishing activitiy. // Add another activity in the Task so that it always contains a non-finishing activity.
final ActivityRecord nonEmbeddedActivity = createActivityRecord(task); createActivityRecord(task);
assertTrue(task.shouldBeVisible(null)); assertTrue(task.shouldBeVisible(null));
// Dispatch pending info changed event from creating the activity // Dispatch pending info changed event from creating the activity
@@ -896,21 +896,21 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
taskFragment.mTaskFragmentAppearedSent = true; taskFragment.mTaskFragmentAppearedSent = true;
mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment); mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentInfoChanged(any()); verify(mOrganizer).onTaskFragmentInfoChanged(any(), any());
// Verify the info changed callback is not called when the task is invisible // Verify the info changed callback is not called when the task is invisible
reset(mOrganizer); reset(mOrganizer);
doReturn(false).when(task).shouldBeVisible(any()); doReturn(false).when(task).shouldBeVisible(any());
mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment); mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer, never()).onTaskFragmentInfoChanged(any()); verify(mOrganizer, never()).onTaskFragmentInfoChanged(any(), any());
// Finish the embedded activity, and verify the info changed callback is called because the // Finish the embedded activity, and verify the info changed callback is called because the
// TaskFragment is becoming empty. // TaskFragment is becoming empty.
embeddedActivity.finishing = true; embeddedActivity.finishing = true;
mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment); mController.onTaskFragmentInfoChanged(mIOrganizer, taskFragment);
mController.dispatchPendingEvents(); mController.dispatchPendingEvents();
verify(mOrganizer).onTaskFragmentInfoChanged(any()); verify(mOrganizer).onTaskFragmentInfoChanged(any(), any());
} }
/** /**
@@ -1020,7 +1020,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
// The pending event will be dispatched on the handler (from requestTraversal). // The pending event will be dispatched on the handler (from requestTraversal).
waitHandlerIdle(mWm.mAnimationHandler); waitHandlerIdle(mWm.mAnimationHandler);
verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(), verify(mOrganizer).onTaskFragmentError(any(), eq(mErrorToken), any(),
eq(HIERARCHY_OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT), eq(HIERARCHY_OP_TYPE_REPARENT_ACTIVITY_TO_TASK_FRAGMENT),
any(SecurityException.class)); any(SecurityException.class));
} }
@@ -1059,7 +1059,7 @@ public class TaskFragmentOrganizerControllerTest extends WindowTestsBase {
// The pending event will be dispatched on the handler (from requestTraversal). // The pending event will be dispatched on the handler (from requestTraversal).
waitHandlerIdle(mWm.mAnimationHandler); waitHandlerIdle(mWm.mAnimationHandler);
verify(mOrganizer).onTaskFragmentError(eq(mErrorToken), any(), verify(mOrganizer).onTaskFragmentError(any(), eq(mErrorToken), any(),
eq(HIERARCHY_OP_TYPE_REPARENT_CHILDREN), any(SecurityException.class)); eq(HIERARCHY_OP_TYPE_REPARENT_CHILDREN), any(SecurityException.class));
} }