commit 77a6164f7a1297703095be485073645fd23a9aa2
author Riddle Hsu <riddlehsu@google.com> Fri Mar 31 05:11:54 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 05:11:54 2023 +0000
tree 0a02cfdeebd40c6815dc9967463d60e71fcfe9ea
parent bfa4c67ac8936b9bbb4c7c5309b954eeee6c552e
parent b1ca1b777f87ca41562878b854473688119e7e12

Merge "Reduce no-op IPC when swiping up" into udc-dev

quickstep/src/com/android/quickstep/SystemUiProxy.java

diff --git a/quickstep/src/com/android/quickstep/SystemUiProxy.java b/quickstep/src/com/android/quickstep/SystemUiProxy.java
index 7cc3e11..26fcb52 100644
--- a/quickstep/src/com/android/quickstep/SystemUiProxy.java
+++ b/quickstep/src/com/android/quickstep/SystemUiProxy.java
@@ -766,7 +766,7 @@
      */
     @Nullable
     public RemoteAnimationTarget[] onGoingToRecentsLegacy(RemoteAnimationTarget[] apps) {
-        if (mSplitScreen != null) {
+        if (!TaskAnimationManager.ENABLE_SHELL_TRANSITIONS && mSplitScreen != null) {
             try {
                 return mSplitScreen.onGoingToRecentsLegacy(apps);
             } catch (RemoteException e) {