commit d4dd48acc94243230df6f94495569d4d973d3242
author Tony Wickham <twickham@google.com> Fri Apr 23 11:55:34 2021 -0700
committer Tony Wickham <twickham@google.com> Fri Apr 23 11:56:42 2021 -0700
tree 3610380b3c617debfcd64f1b2de3afb3fb405785
parent 5241e3ebc05d3b3928a8a982dbb317e6d3fa9dfa

Add null check to NavigationModeFeatureFlag

Test: none
Fixes: 185790043
Change-Id: I591c18df0394e7ab4286687fffe8713a4507373e

quickstep/src/com/android/quickstep/util/NavigationModeFeatureFlag.java

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