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

Only manipulate leashes for leaf-tasks when adapting to legacy

Browse Source 
We only wrap leaf-tasks for legacy animations; however, I forgot
to update some places so they were trying to use non-leaf leashes.

Bug: 229758341
Test: atest ActivityVisibilityTests#testTurnScreenOnAttrNoLockScreen_SplitScreen
Change-Id: Iee5c08c8dad268b798b372311a80ddede1a4beaa
This commit is contained in:
Evan Rosky
2022-04-19 15:15:21 -07:00
parent 6109fec65b
commit b514790cbc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationAdapterCompat.java
View File

@@ -137,6 +137,8 @@ public class RemoteAnimationAdapterCompat {
float displayH = 0;
for (int i = info.getChanges().size() - 1; i >= 0; --i) {
final TransitionInfo.Change change = info.getChanges().get(i);
// skip changes that we didn't wrap
if (!leashMap.containsKey(change.getLeash())) continue;
if (change.getTaskInfo() != null
&& change.getTaskInfo().getActivityType() == ACTIVITY_TYPE_HOME) {
isReturnToHome = change.getMode() == TRANSIT_OPEN
@@ -173,6 +175,8 @@ public class RemoteAnimationAdapterCompat {
for (int i = info.getChanges().size() - 1; i >= 0; --i) {
final TransitionInfo.Change change = info.getChanges().get(i);
final SurfaceControl leash = leashMap.get(change.getLeash());
// skip changes that we didn't wrap
if (leash == null) continue;
final int mode = info.getChanges().get(i).getMode();
// Only deal with independent layers
if (!TransitionInfo.isIndependent(change, info)) continue;