summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-26 19:39:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-26 19:39:34 +0000
commitf8e12b78bfdece92d90bd1d859486420cc4e391b (patch)
tree73e8b50433e65e79759b322cdf46fc44ed6b4d1c
parente1486520758b8bfd9925980ec15348b413c05766 (diff)
parent0036b2b67aeb3d87ca8b3b153061d98c29204ba9 (diff)
downloadLauncher3-f8e12b78bfdece92d90bd1d859486420cc4e391b.tar.gz
Merge "Add NPE check for prediction controller" into rvc-dev
-rw-r--r--quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
index 0fdc6841b5..9ed2bbef38 100644
--- a/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
+++ b/quickstep/src/com/android/quickstep/util/QuickstepOnboardingPrefs.java
@@ -101,7 +101,8 @@ public class QuickstepOnboardingPrefs extends OnboardingPrefs<BaseQuickstepLaunc
});
}
- 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;