| commit | fe6d3c62212393db367b1ff8eecefb917985ad56 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 08:06:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 08:06:49 2020 +0000 |
| tree | cec78f2cae603c68b2b661273e03465f540995d1 | |
| parent | 07a31d04acd68fb31ed26581a2c23788bf3cc83a [diff] | |
| parent | f59922d0d772a43ca5ead3e9fa4db83f695b8fe0 [diff] |
Merge "Add NPE check for prediction controller" into ub-launcher3-rvc-dev am: f59922d0d7 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12000756 Change-Id: I7ecfc4c45bbc60fc29181ac81606e26d06196392
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java index 0fdc684..9ed2bbe 100644 --- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java +++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -101,7 +101,8 @@ }); } - if (!hasReachedMaxCount(HOTSEAT_DISCOVERY_TIP_COUNT)) { + if (FeatureFlags.ENABLE_HYBRID_HOTSEAT.get() && !hasReachedMaxCount( + HOTSEAT_DISCOVERY_TIP_COUNT)) { stateManager.addStateListener(new StateListener<LauncherState>() { boolean mFromAllApps = false;