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

Merge "Do not notify transition finish for a initializing activity" into udc-dev am: c645d5d217 am: ee2792e8a3

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

Change-Id: I0b96dfd386fccaa715afc5fc5460909aa4c4edf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-06-07 08:47:32 +00:00
committed by Automerger Merge Worker
parent 897272c156 ee2792e8a3
commit aaaec7f3a0
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/Transition.java
View File

@@ -1190,7 +1190,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
// processed all the participants first (in particular, we want to trigger pip-enter first)
for (int i = 0; i < mParticipants.size(); ++i) {
final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
if (ar != null) {
// If the activity was just inserted to an invisible task, it will keep INITIALIZING
// state. Then no need to notify the callback to avoid clearing some states
// unexpectedly, e.g. launch-task-behind.
if (ar != null && (ar.isVisibleRequested()
|| !ar.isState(ActivityRecord.State.INITIALIZING))) {
mController.dispatchLegacyAppTransitionFinished(ar);
}
}

10
services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
View File

@@ -1346,6 +1346,16 @@ public class TransitionTests extends WindowTestsBase {
activity1.setVisible(false);
abortTransition.abort();
assertTrue(activity1.isVisible());
// The mLaunchTaskBehind flag of an invisible initializing activity should not be cleared.
final Transition noChangeTransition = controller.createTransition(TRANSIT_OPEN);
noChangeTransition.collect(activity1);
activity1.setVisibleRequested(false);
activity1.setState(ActivityRecord.State.INITIALIZING, "test");
activity1.mLaunchTaskBehind = true;
mWm.mSyncEngine.abort(noChangeTransition.getSyncId());
noChangeTransition.finishTransition();
assertTrue(activity1.mLaunchTaskBehind);
}
@Test