[automerger] Fix crash caused by removing update listener in update listener. am: 012d39a0e9

Change-Id: I8f88ca66ee8d7ffed2de2864130331d5a0d9f6c8
2018-05-25 17:42:51 +00:00
parent dc257e6e71 012d39a0e9
commit cd1727c069
1 changed files with 5 additions and 2 deletions
@@ -466,9 +466,12 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
     */
    public void addSpringFromFlingUpdateListener(ValueAnimator animator, float velocity) {
        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            boolean shouldSpring = true;
+
            @Override
            public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                if (valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
+                if (shouldSpring
+                        && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
                    int searchViewId = getSearchView().getId();
                    addSpringView(searchViewId);

@@ -481,7 +484,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
                                }
                            });

-                    animator.removeUpdateListener(this);
+                    shouldSpring = false;
                }
            }
        });