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

Make sure the color background is only cleared once

Browse Source 
The cancel and finished callbacks are both run if we cancel the surface animation without restart and we only want to call clear once for everytime we call setbackground otherwise the background color counter would be out of sync and we might not remve the color background when expected

Bug: 202141435
Change-Id: I0027d581b60c3acf0e02e66026d49c41435882ce
This commit is contained in:
Pablo Gamito
2021-10-05 15:59:48 +02:00
parent c0dd1d6d01
commit fac7bc9216
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/WindowContainer.java
View File

@@ -111,6 +111,7 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -2856,8 +2857,18 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
taskDisplayArea.setBackgroundColor(backgroundColor);
}
// Atomic counter to make sure the clearColor callback is only called one.
// It will be called twice in the case we cancel the animation without restart
// (in that case it will run as the cancel and finished callbacks).
final AtomicInteger callbackCounter = new AtomicInteger(0);
final Runnable clearBackgroundColorHandler = () -> {
if (callbackCounter.getAndIncrement() == 0) {
taskDisplayArea.clearBackgroundColor();
}
};
final Runnable cleanUpCallback = isSettingBackgroundColor
? taskDisplayArea::clearBackgroundColor : () -> {};
? clearBackgroundColorHandler : () -> {};
startAnimation(getPendingTransaction(), adapter, !isVisible(),
ANIMATION_TYPE_APP_TRANSITION,