commit 024dd4ba47b904f392699c448f7cb29b9aac5446
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 23 20:41:35 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 23 20:41:35 2021 +0000
tree a6846d25a4416fa22f3e0d4eb5ae09c7e103f16d
parent ad4120494661eaaef3ab16eaf58bda03b706d3b7
parent d4dd48acc94243230df6f94495569d4d973d3242

Merge "Add null check to NavigationModeFeatureFlag" into sc-dev

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) {