commit 83546a83edd5073d43de6fc1dd8400291ec0f7c0
author Tony Mak <tonymak@google.com> Mon Jan 22 13:56:20 2018 +0000
committer Tony Mak <tonymak@google.com> Mon Jan 29 14:21:28 2018 +0000
tree 3cca8289827fac849c5e9cf88ab59f5d0be579d0
parent 650fa8579e8978cfc8822f8a83b1bbf3c118ab86

Defer cross profile animation is the activity is intercepted
... for work mode / work challenge

Test: Turn off work mode -> invoke the API to switch to work profile
      -> observe the animation is deferred when the original target
      is started
Test: Repeat the above test with work challenge

FIXES: 71840869

Change-Id: I0005b789de17b73e6b89500a183891435b384bdd

services/core/java/com/android/server/wm/AppTransition.java

diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java
index fc7ad09..2bdaa1a 100644
--- a/services/core/java/com/android/server/wm/AppTransition.java
+++ b/services/core/java/com/android/server/wm/AppTransition.java
@@ -38,6 +38,7 @@
 import static android.view.WindowManager.TRANSIT_WALLPAPER_INTRA_CLOSE;
 import static android.view.WindowManager.TRANSIT_WALLPAPER_INTRA_OPEN;
 import static android.view.WindowManager.TRANSIT_WALLPAPER_OPEN;
+
 import static com.android.internal.R.styleable.WindowAnimation_activityCloseEnterAnimation;
 import static com.android.internal.R.styleable.WindowAnimation_activityCloseExitAnimation;
 import static com.android.internal.R.styleable.WindowAnimation_activityOpenEnterAnimation;
@@ -1647,10 +1648,7 @@
                         + " transit=" + appTransitionToString(transit) + " isEntrance=" + enter
                         + " Callers=" + Debug.getCallers(3));
             }
-        } else if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_OPEN_CROSS_PROFILE_APPS
-                && (transit == TRANSIT_ACTIVITY_OPEN
-                        || transit == TRANSIT_TASK_OPEN
-                        || transit == TRANSIT_TASK_TO_FRONT)) {
+        } else if (mNextAppTransitionType == NEXT_TRANSIT_TYPE_OPEN_CROSS_PROFILE_APPS && enter) {
 
             a = loadAnimationRes("android", enter
                     ? com.android.internal.R.anim.task_open_enter_cross_profile_apps