| commit | 53c7ddd7fd7648f2ac58e3a21158599860ad4446 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 19:53:41 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 19:53:41 2020 +0000 |
| tree | b4d31f8b3e4065e31678ee940d6dfe1391287360 | |
| parent | aa823d103ed82ec052eb80918ea025dbd43ccc7c [diff] | |
| parent | f8e12b78bfdece92d90bd1d859486420cc4e391b [diff] |
Merge "Add NPE check for prediction controller" into rvc-dev am: f8e12b78bf Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12001481 Change-Id: Ibfd144b7208099e3ed50530cd1e7b948c3eb7b80
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;