commit e241f6c2434910f454fa933d3b54532906c963d6
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 15 10:31:56 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 15 10:31:56 2020 +0000
tree ba428b2a87da260d1dbc9589bcd097431b1be7ee
parent 63cbfc611825fdab5e8e45f9430a13d1a5108706
parent 6793dae6920a0410d776ecd7a2daac105405ba8b

Merge "Prevent all apps prediction update while visible" into ub-launcher3-rvc-dev

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java

diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
index ab3c71a..b6a8206 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
@@ -211,8 +211,11 @@
     }
 
     private void dispatchOnChange(boolean changed) {
-        PredictionState newState = changed ? parseLastState() :
-                (mPendingState == null ? mCurrentState : mPendingState);
+        PredictionState newState = changed
+                ? parseLastState()
+                : mPendingState != null && canApplyPredictions(mPendingState)
+                        ? mPendingState
+                        : mCurrentState;
         if (changed && mAppsView != null && !canApplyPredictions(newState)) {
             scheduleApplyPredictedApps(newState);
         } else {