From 0036b2b67aeb3d87ca8b3b153061d98c29204ba9 Mon Sep 17 00:00:00 2001
From: Samuel Fufa <sfufa@google.com>
Date: Thu, 25 Jun 2020 11:17:16 -0700
Subject: [PATCH] Add NPE check for prediction controller

Bug: 159835714
Test: Manual
Change-Id: I9cc03f6491f4e14462be6c01edf3ed4ca1d82136
---
 .../com/android/quickstep/util/QuickstepOnboardingPrefs.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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;