commit 59d1214798549259d2a123ce174cd434b6d18435
author Jon Miranda <jonmiranda@google.com> Mon Apr 17 12:53:05 2023 -0700
committer Jon Miranda <jonmiranda@google.com> Tue Apr 18 19:38:53 2023 +0000
tree e8f64c0c061cab5ab0d3fd1833030b33724cfd9d
parent 47f2dd6a11d459312f5ab1928455e38a0bfc3f08

Remove ActivityInfo.CONFIG_SCREEN_SIZE if orientation is still the same.

Avoid NPE to unblock development while we investigate root cause.

Bug: 274394837
Test: see repo steps in bug comment #11
Change-Id: Ib18aa9da1d2827ae03037215ff9e34d27493995b
Flag: ENABLE_TRANSIENT_TASKBAR true

quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index 3d8bf9e..ca29afb 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -168,9 +168,14 @@
                     DeviceProfile oldDp = mTaskbarActivityContext.getDeviceProfile();
                     boolean isOrientationChange =
                             (configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0;
+
+                    int newOrientation = newConfig.windowConfiguration.getRotation();
+                    int oldOrientation = mOldConfig.windowConfiguration.getRotation();
                     int oldWidth = isOrientationChange ? oldDp.heightPx : oldDp.widthPx;
                     int oldHeight = isOrientationChange ? oldDp.widthPx : oldDp.heightPx;
-                    if (dp.widthPx == oldWidth && dp.heightPx == oldHeight) {
+
+                    if ((dp.widthPx == oldWidth && dp.heightPx == oldHeight)
+                            || (newOrientation == oldOrientation)) {
                         configDiffForRecreate &= ~ActivityInfo.CONFIG_SCREEN_SIZE;
                     }
                 }