commit 987e375312c3d2f93e29bad80f9dfd12bc3e10e4
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 15 10:43:06 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 15 10:43:06 2020 +0000
tree 18f590c679edd8e804a4d3c51bbb89c4cd20e2f0
parent 023936645602a192e255f948062abd3cd2ed6758
parent e241f6c2434910f454fa933d3b54532906c963d6

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

Change-Id: I46f4afd992fd15c4c9b82a8bc4b85ba923598024

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 {