Prevent interacting with secondary handle if not initialized

Bug: 167831766 Change-Id: Id63e7f60806ba6ea3d8cffbbb2849b2d0323e802
2021-02-03 14:11:11 -08:00
parent 8ae80bcaa6
commit de29032500
1 changed files with 2 additions and 2 deletions
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
@@ -665,7 +665,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
    }

    private void initSecondaryHomeHandleForRotation() {
-        if (!canShowSecondaryHandle()) {
+        if (mNavBarMode != NAV_BAR_MODE_GESTURAL) {
            return;
        }

@@ -1520,7 +1520,7 @@ public class NavigationBar implements View.OnAttachStateChangeListener,
    }

    private boolean canShowSecondaryHandle() {
-        return mNavBarMode == NAV_BAR_MODE_GESTURAL;
+        return mNavBarMode == NAV_BAR_MODE_GESTURAL && mOrientationHandle != null;
    }

    private final Consumer<Integer> mRotationWatcher = rotation -> {