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

Create a new Transaction to apply the edge extensions

Browse Source 
mFrameTransaction is not thread safe and should only be used in the animation thread, but here we were accessing this transaction in a binder thread through the TransactionCommittedListenerCallback.

Bug: 228000332

Test: atest CtsWindowManagerDeviceTestCases:ActivityTransitionTests
Change-Id: Ia5c5022ebd1a12f45fecbb80905606dbda85caf9
This commit is contained in:
Pablo Gamito
2022-04-05 15:52:47 +00:00
parent cbc449164b
commit 9385a91063
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,13 +176,24 @@ class SurfaceAnimationRunner {
t.addTransactionCommittedListener(Runnable::run, () -> {
final WindowAnimationSpec animationSpec = a.asWindowAnimationSpec();
final Transaction edgeExtensionCreationTransaction = new Transaction();
edgeExtendWindow(animationLeash,
animationSpec.getRootTaskBounds(), animationSpec.getAnimation(),
mFrameTransaction);
edgeExtensionCreationTransaction);
synchronized (mLock) {
// only run if animation is not yet canceled by this point
if (mPreProcessingAnimations.get(animationLeash) == runningAnim) {
// In the case the animation is cancelled, edge extensions are removed
// onAnimationLeashLost which is called before onAnimationCancelled.
// So we need to check if the edge extensions have already been removed
// or not, and if so we don't want to apply the transaction.
synchronized (mEdgeExtensionLock) {
if (!mEdgeExtensions.isEmpty()) {
edgeExtensionCreationTransaction.apply();
}
}
mPreProcessingAnimations.remove(animationLeash);
mPendingAnimations.put(animationLeash, runningAnim);
if (!mAnimationStartDeferred) {