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

Merge "Fix NPE for transitionGoodToGoForTaskFragments" into sc-v2-dev am: 3fdf22148f

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

Change-Id: I1c5d6ae0c924f6d4290d0d60083e2ea68114bcec
This commit is contained in:
Chris Li
2021-10-05 12:23:37 +00:00
committed by Automerger Merge Worker
parent 5b905266dd 3fdf22148f
commit e72de075d9
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/AppTransitionController.java
View File

@@ -1108,6 +1108,11 @@ public class AppTransitionController {
// the same transition. // the same transition.
for (int i = rootTasks.size() - 1; i >= 0; i--) { for (int i = rootTasks.size() - 1; i >= 0; i--) {
final Task rootTask = rootTasks.valueAt(i); final Task rootTask = rootTasks.valueAt(i);
if (rootTask == null) {
// It is possible that one activity may have been removed from the hierarchy. No
// need to check for this case.
continue;
}
final boolean notReady = rootTask.forAllLeafTaskFragments(taskFragment -> { final boolean notReady = rootTask.forAllLeafTaskFragments(taskFragment -> {
if (!taskFragment.isReadyToTransit()) { if (!taskFragment.isReadyToTransit()) {
ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Organized TaskFragment is not ready= %s", ProtoLog.v(WM_DEBUG_APP_TRANSITIONS, "Organized TaskFragment is not ready= %s",

34
services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java
View File

@@ -922,6 +922,40 @@ public class AppTransitionControllerTest extends WindowTestsBase {
verify(mDisplayContent.mAppTransition).goodToGo(anyInt(), any()); verify(mDisplayContent.mAppTransition).goodToGo(anyInt(), any());
} }
@Test
public void testTransitionGoodToGoForTaskFragments_detachedApp() {
final TaskFragmentOrganizer organizer = new TaskFragmentOrganizer(Runnable::run);
final Task task = createTask(mDisplayContent);
final TaskFragment changeTaskFragment =
createTaskFragmentWithEmbeddedActivity(task, organizer);
final TaskFragment emptyTaskFragment = new TaskFragmentBuilder(mAtm)
.setParentTask(task)
.setOrganizer(organizer)
.build();
changeTaskFragment.getTopMostActivity().allDrawn = true;
// To make sure that having a detached activity won't cause any issue.
final ActivityRecord detachedActivity = createActivityRecord(task);
detachedActivity.removeImmediately();
assertNull(detachedActivity.getRootTask());
spyOn(mDisplayContent.mAppTransition);
spyOn(emptyTaskFragment);
prepareAndTriggerAppTransition(
null /* openingActivity */, detachedActivity, changeTaskFragment);
// Transition not ready because there is an empty non-finishing TaskFragment.
verify(mDisplayContent.mAppTransition, never()).goodToGo(anyInt(), any());
doReturn(true).when(emptyTaskFragment).hasChild();
emptyTaskFragment.remove(false /* withTransition */, "test");
mDisplayContent.mAppTransitionController.handleAppTransitionReady();
// Transition ready because the empty (no running activity) TaskFragment is requested to be
// removed.
verify(mDisplayContent.mAppTransition).goodToGo(anyInt(), any());
}
/** Registers remote animation for the organizer. */ /** Registers remote animation for the organizer. */
private void setupTaskFragmentRemoteAnimation(TaskFragmentOrganizer organizer, private void setupTaskFragmentRemoteAnimation(TaskFragmentOrganizer organizer,
RemoteAnimationAdapter adapter) { RemoteAnimationAdapter adapter) {