summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2019-02-15 00:10:56 +0800
committer Riddle Hsu <riddlehsu@google.com> 2019-02-15 00:10:56 +0800
commitec6467c2722d4fee432b8bfc4af55b516a08422e (patch)
tree169e70c8b2ba5968883a993cfaafa2a17f1bad05
parent3e0c72484dff8b11b599cce09c4070cf71393215 (diff)
Fetch transition specs if the state is already ready
The timing to invoke override pending transition may be later than state ready. This change makes a chance to fetch specs when setting the override transition. So the the transition execution can wait until the specs is fetched and apply the correct transition type. Bug: 35633644 Bug: 123172960 Test: manual - Enter split-screen mode and check the transition should be aspect scaling instead of normal launch animation. Change-Id: I1072f60cb9b323c26b342bce1d0ad458d30fb5ef
-rw-r--r--services/core/java/com/android/server/wm/AppTransition.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index 6dc73bbb80cb..19ff43822923 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -1879,6 +1879,9 @@ public class AppTransition implements Dump {
mNextAppTransitionAnimationsSpecsFuture = specsFuture;
mNextAppTransitionScaleUp = scaleUp;
mNextAppTransitionFutureCallback = callback;
+ if (isReady()) {
+ fetchAppTransitionSpecsFromFuture();
+ }
}
}