commit f2b4539068320710c0a62fce3c4b5717969859c1
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 23 21:01:21 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 23 21:01:21 2021 +0000
tree cc15c2b8e6184e03116d22be2b04df6b91470294
parent 4529a766a2736e0d6fe73e78554685bd0e041de3
parent 024dd4ba47b904f392699c448f7cb29b9aac5446

Merge "Add null check to NavigationModeFeatureFlag" into sc-dev am: 024dd4ba47

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14295521

Change-Id: I5818e1249f45c6621d98c03f6991a87c378b3095

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