| commit | 879ba9803d4330e289bcc86470a567f0721a69a4 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 20:45:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 20:45:18 2020 +0000 |
| tree | 16b95a98e8245e4dc3d1877024708b2266828acd | |
| parent | 2bce3cb82f324b130ff91ea4cc2291dff794510a [diff] | |
| parent | 4585f9f3c598509ab93999ee8d9d0d80566f1560 [diff] |
Merge "Add NPE check for prediction controller" into rvc-dev am: f8e12b78bf am: 53c7ddd7fd am: 39e1af9a27 am: 4585f9f3c5 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12001481 Change-Id: I18caa4806f4933059fb1bdc5165e5aa80b5bd605
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;