From d4dd48acc94243230df6f94495569d4d973d3242 Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Fri, 23 Apr 2021 11:55:34 -0700
Subject: [PATCH] Add null check to NavigationModeFeatureFlag

Test: none
Fixes: 185790043
Change-Id: I591c18df0394e7ab4286687fffe8713a4507373e
---
 .../com/android/quickstep/util/NavigationModeFeatureFlag.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
index 351adf4265..c527be3e2a 100644
--- a/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
+++ b/quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java
@@ -46,7 +46,8 @@ public class NavigationModeFeatureFlag implements
     }
 
     public boolean get() {
-        return mBasePredicate.get() && mSupported && mObserver.isHomeAndOverviewSame();
+        return mBasePredicate.get() && mSupported && mObserver != null
+                && mObserver.isHomeAndOverviewSame();
     }
 
     public void initialize(Context context) {