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