From de29032500c051000adbb20f709fb227f213fc78 Mon Sep 17 00:00:00 2001
From: Vinit Nayak <peanutbutter@google.com>
Date: Wed, 3 Feb 2021 14:11:11 -0800
Subject: [PATCH] Prevent interacting with secondary handle if not initialized

Bug: 167831766
Change-Id: Id63e7f60806ba6ea3d8cffbbb2849b2d0323e802
---
 .../src/com/android/systemui/navigationbar/NavigationBar.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java b/packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBar.java
index fcb5da3f8c525..c8375db211231 100644
--- 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 -> {