Catch RemoteAnimationTarget.rotationChange (LawnchairLauncher#3776)

validcube · Dec 15, 2023 · 4831ef8 · 4831ef8
1 parent a815252
commit 4831ef8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java b/quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
@@ -1238,9 +1238,12 @@ public void onAnimationStart(Animator animation) {
 
     private static int getRotationChange(RemoteAnimationTargetCompat[] appTargets) {
         int rotationChange = 0;
-        for (RemoteAnimationTargetCompat target : appTargets) {
-            if (Math.abs(target.rotationChange) > Math.abs(rotationChange)) {
-                rotationChange = target.rotationChange;
+        for (RemoteAnimationTarget target : appTargets) {
+            try {
+                if (Math.abs(target.rotationChange) > Math.abs(rotationChange)) {
+                    rotationChange = target.rotationChange;
+                }
+            } catch (NoSuchFieldError ignored) {
             }
         }
         return rotationChange;

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -1375,13 +1375,18 @@ public void onAnimationSuccess(Animator animator) {
         }
     }
 
-    private int calculateWindowRotation(RemoteAnimationTargetCompat runningTaskTarget,
-            RecentsOrientedState orientationState) {
-        if (runningTaskTarget.rotationChange != 0
+    private int calculateWindowRotation(RemoteAnimationTarget runningTaskTarget,
+                                        RecentsOrientedState orientationState) {
+        try {
+            if (runningTaskTarget.rotationChange != 0
                 && TaskAnimationManager.ENABLE_SHELL_TRANSITIONS) {
-            return Math.abs(runningTaskTarget.rotationChange) == ROTATION_90
-                    ? ROTATION_270 : ROTATION_90;
-        } else {
+                return Math.abs(runningTaskTarget.rotationChange) == ROTATION_90
+                    ? ROTATION_270
+                    : ROTATION_90;
+            } else {
+                return orientationState.getDisplayRotation();
+            }
+        } catch (NoSuchFieldError ignored) {
             return orientationState.getDisplayRotation();
         }
     }