| commit | 868bceb30a8eddd6502d32d596003f57a6d00e79 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 20:06:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 20:06:35 2020 +0000 |
| tree | 6b22112845cffc925cd2660f1ebf5508dd9b9f04 | |
| parent | c30c80af5e6636d2b992b1b0101086042cc2571b [diff] | |
| parent | 9929673657ec7c03524f17f0318e5f5beb03c368 [diff] |
Merge "Add NPE check for prediction controller" into rvc-dev am: f8e12b78bf am: 9929673657 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12001481 Change-Id: I78f979a418b467f303939a12936fbb8fe89cf4bb
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;