Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59d12147 authored by Jon Miranda's avatar Jon Miranda
Browse files

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
parent 47f2dd6a

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

+6 −1
Original line number Diff line number Diff line
@@ -168,9 +168,14 @@ public class TaskbarManager { 
                    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;

                    }

                }