| commit | fdee930dbf550a11427f3c4d1bc121a0a8924011 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jun 26 19:54:10 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 26 19:54:10 2020 +0000 |
| tree | 73e8b50433e65e79759b322cdf46fc44ed6b4d1c | |
| parent | c629ed24f0c6ae54573d6bf3f7f01a23894bcf03 [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: I3ef055351d959da2c35474929ad0a7d946ca52f7
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;