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

Merge "Don't apply transactions of abort out-of-order." into udc-dev am: bb726e9c7f

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

Change-Id: I5fb787a0070ff2db30a651a54c56113d9b8ab38f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Evan Rosky
2023-06-13 06:07:54 +00:00
committed by Automerger Merge Worker
parent 85c39d8f00 bb726e9c7f
commit a094ab219e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -809,6 +809,9 @@ public class Transitions implements RemoteCallable<Transitions>,
track.mReadyTransitions.remove(0); track.mReadyTransitions.remove(0);
track.mActiveTransition = ready; track.mActiveTransition = ready;
if (ready.mAborted) { if (ready.mAborted) {
if (ready.mStartT != null) {
ready.mStartT.apply();
}
// finish now since there's nothing to animate. Calls back into processReadyQueue // finish now since there's nothing to animate. Calls back into processReadyQueue
onFinish(ready, null, null); onFinish(ready, null, null);
return; return;
@@ -936,10 +939,6 @@ public class Transitions implements RemoteCallable<Transitions>,
/** Aborts a transition. This will still queue it up to maintain order. */ /** Aborts a transition. This will still queue it up to maintain order. */
private void onAbort(ActiveTransition transition) { private void onAbort(ActiveTransition transition) {
final Track track = mTracks.get(transition.getTrack()); final Track track = mTracks.get(transition.getTrack());
// apply immediately since they may be "parallel" operations: We currently we use abort for
// thing which are independent to other transitions (like starting-window transfer).
transition.mStartT.apply();
transition.mFinishT.apply();
transition.mAborted = true; transition.mAborted = true;
mTracer.logAborted(transition.mInfo.getDebugId()); mTracer.logAborted(transition.mInfo.getDebugId());