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

Merge "Let the finishing transition commit the visibility" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-15 05:49:44 +00:00
committed by Android (Google) Code Review
parent 4e7e638ee6 4893b90460
commit 99e9394054
7 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -5263,13 +5263,18 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
// Before setting mVisibleRequested so we can track changes.
boolean isCollecting = false;
boolean inFinishingTransition = false;
if (mTransitionController.isShellTransitionsEnabled()) {
isCollecting = mTransitionController.isCollecting();
if (isCollecting) {
mTransitionController.collect(this);
} else {
Slog.e(TAG, "setVisibility=" + visible + " while transition is not collecting "
+ this + " caller=" + Debug.getCallers(8));
inFinishingTransition = mTransitionController.inFinishingTransition(this);
if (!inFinishingTransition) {
Slog.e(TAG, "setVisibility=" + visible
+ " while transition is not collecting or finishing "
+ this + " caller=" + Debug.getCallers(8));
}
}
}
@@ -5346,6 +5351,10 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
}
return;
}
if (inFinishingTransition) {
// Let the finishing transition commit the visibility.
return;
}
// If we are preparing an app transition, then delay changing
// the visibility of this token until we execute that transition.
if (deferCommitVisibilityChange(visible)) {

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

@@ -814,6 +814,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
if (mState < STATE_PLAYING) {
throw new IllegalStateException("Can't finish a non-playing transition " + mSyncId);
}
mController.mFinishingTransition = this;
boolean hasParticipatedDisplay = false;
boolean hasVisibleTransientLaunch = false;
@@ -995,6 +996,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
// Handle back animation if it's already started.
mController.mAtm.mBackNavigationController.handleDeferredBackAnimation(mTargets);
mController.mFinishingTransition = null;
}
void abort() {
@@ -1274,7 +1276,7 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
if (mFinishTransaction != null) {
mFinishTransaction.apply();
}
mController.finishTransition(mToken);
mController.finishTransition(this);
}
private void cleanUpInternal() {

17
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -107,6 +107,9 @@ class TransitionController {
*/
private final ArrayList<Transition> mPlayingTransitions = new ArrayList<>();
/** The currently finishing transition. */
Transition mFinishingTransition;
/**
* The windows that request to be invisible while it is in transition. After the transition
* is finished and the windows are no longer animating, their surfaces will be destroyed.
@@ -313,6 +316,11 @@ class TransitionController {
return false;
}
/** Returns {@code true} if the `wc` is a participant of the finishing transition. */
boolean inFinishingTransition(WindowContainer<?> wc) {
return mFinishingTransition != null && mFinishingTransition.mParticipants.contains(wc);
}
/** @return {@code true} if a transition is running */
boolean inTransition() {
// TODO(shell-transitions): eventually properly support multiple
@@ -672,14 +680,13 @@ class TransitionController {
}
/** @see Transition#finishTransition */
void finishTransition(@NonNull IBinder token) {
void finishTransition(Transition record) {
// It is usually a no-op but make sure that the metric consumer is removed.
mTransitionMetricsReporter.reportAnimationStart(token, 0 /* startTime */);
mTransitionMetricsReporter.reportAnimationStart(record.getToken(), 0 /* startTime */);
// It is a no-op if the transition did not change the display.
mAtm.endLaunchPowerMode(POWER_MODE_REASON_CHANGE_DISPLAY);
final Transition record = Transition.fromBinder(token);
if (record == null || !mPlayingTransitions.contains(record)) {
Slog.e(TAG, "Trying to finish a non-playing transition " + token);
if (!mPlayingTransitions.contains(record)) {
Slog.e(TAG, "Trying to finish a non-playing transition " + record);
return;
}
ProtoLog.v(ProtoLogGroup.WM_DEBUG_WINDOW_TRANSITIONS, "Finish Transition: %s", record);

7
services/core/java/com/android/server/wm/WindowOrganizerController.java
View File

@@ -391,9 +391,14 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
// apply the incoming transaction before finish in case it alters the visibility
// of the participants.
if (t != null) {
// Set the finishing transition before applyTransaction so the visibility
// changes of the transition participants will only set visible-requested
// and still let finishTransition handle the participants.
mTransitionController.mFinishingTransition = transition;
applyTransaction(t, syncId, null /*transition*/, caller, transition);
}
getTransitionController().finishTransition(transitionToken);
mTransitionController.finishTransition(transition);
mTransitionController.mFinishingTransition = null;
if (syncId >= 0) {
setSyncReady(syncId);
}

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

@@ -1391,7 +1391,7 @@ public class TransitionTests extends WindowTestsBase {
verify(snapshotController, times(1)).recordSnapshot(eq(task2), eq(false));
openTransition.finishTransition();
controller.finishTransition(openTransition);
// We are now going to simulate closing task1 to return back to (open) task2.
final Transition closeTransition = controller.createTransition(TRANSIT_CLOSE);
@@ -1416,7 +1416,19 @@ public class TransitionTests extends WindowTestsBase {
verify(snapshotController, times(0)).recordSnapshot(eq(task1), eq(false));
enteringAnimReports.clear();
closeTransition.finishTransition();
final boolean[] wasInFinishingTransition = { false };
controller.registerLegacyListener(new WindowManagerInternal.AppTransitionListener() {
@Override
public void onAppTransitionFinishedLocked(IBinder token) {
final ActivityRecord r = ActivityRecord.forToken(token);
if (r != null) {
wasInFinishingTransition[0] = controller.inFinishingTransition(r);
}
}
});
controller.finishTransition(closeTransition);
assertTrue(wasInFinishingTransition[0]);
assertNull(controller.mFinishingTransition);
assertEquals(ActivityTaskManagerService.APP_SWITCH_DISALLOW, mAtm.getBalAppSwitchesState());
assertFalse(activity1.app.hasActivityInVisibleTask());

2
services/tests/wmtests/src/com/android/server/wm/WallpaperControllerTests.java
View File

@@ -396,7 +396,7 @@ public class WallpaperControllerTests extends WindowTestsBase {
final SurfaceControl.Transaction t = mock(SurfaceControl.Transaction.class);
token.finishSync(t, false /* cancel */);
transit.onTransactionReady(transit.getSyncId(), t);
dc.mTransitionController.finishTransition(transit.getToken());
dc.mTransitionController.finishTransition(transit);
assertFalse(wallpaperWindow.isVisible());
assertFalse(token.isVisible());
}

2
services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
View File

@@ -1799,7 +1799,7 @@ class WindowTestsBase extends SystemServiceTestsBase {
}
public void finish() {
mController.finishTransition(mLastTransit.getToken());
mController.finishTransition(mLastTransit);
}
}
}