| commit | 27d13599ecca6a6c50065689f6baa0558698eba4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Apr 23 21:01:20 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 23 21:01:20 2021 +0000 |
| tree | 1ecde62af9e2683040999036325a2120ac1e6652 | |
| parent | f9fcdb5ab58d14a96857ad8f29df024c7852ff88 [diff] | |
| parent | 024dd4ba47b904f392699c448f7cb29b9aac5446 [diff] |
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: Ia8cc6716599c7a53a25cb6f7e79460e3059b1f59
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) {