commit 1eb730a69c3862ee8471e659f3861e6ec2e269c1
author Alex Chau <alexchau@google.com> Fri Jul 08 10:52:01 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 08 10:52:01 2022 +0000
tree 5afcba288f5828a3d6ca5f7a0bdf218f0b604655
parent 653cad4ec6d758a4acebccb5a57e67845a400f66
parent 2f8e69ea96eaeab542b6859317c5e5af1845700d

Merge "Always return portrait orientation handler when Recents activity can rotate" into tm-qpr-dev

quickstep/src/com/android/quickstep/util/RecentsOrientedState.java

diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index 14190b3..f2fcd06 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -221,8 +221,7 @@
 
     private boolean updateHandler() {
         mRecentsActivityRotation = inferRecentsActivityRotation(mDisplayRotation);
-        if (mRecentsActivityRotation == mTouchRotation || (isRecentsActivityRotationAllowed()
-                && (mFlags & FLAG_SWIPE_UP_NOT_RUNNING) != 0)) {
+        if (mRecentsActivityRotation == mTouchRotation || isRecentsActivityRotationAllowed()) {
             mOrientationHandler = PagedOrientationHandler.PORTRAIT;
         } else if (mTouchRotation == ROTATION_90) {
             mOrientationHandler = PagedOrientationHandler.LANDSCAPE;