Merge remote-tracking branch 'caf/LA.BR.1.2.3_1' into caf/cm-12.1caf/cm-12.1

1 files changed, 13 insertions, 0 deletions

diff --git a/src/com/android/dialer/calllog/CallLogAdapterHelper.java b/src/com/android/dialer/calllog/CallLogAdapterHelper.java
index a16935cfe..90b458442 100644
--- a/src/com/android/dialer/calllog/CallLogAdapterHelper.java
+++ b/src/com/android/dialer/calllog/CallLogAdapterHelper.java
@@ -137,6 +137,9 @@ public class CallLogAdapterHelper implements ViewTreeObserver.OnPreDrawListener
                 // Check if thread is finished, and if so return immediately.
                 if (mDone) return;
 
+                // only update contact info when scroll state is not fling.
+                if (mBusy) continue;
+
                 // Obtain next request, if any is available.
                 // Keep synchronized section small.
                 ContactInfoRequest req = null;
@@ -201,6 +204,8 @@ public class CallLogAdapterHelper implements ViewTreeObserver.OnPreDrawListener
     /** Can be set to true by tests to disable processing of requests. */
     private volatile boolean mRequestProcessingDisabled = false;
 
+    private boolean mBusy;
+
     /**
      * List of requests to update contact details.
      * <p>
@@ -228,6 +233,14 @@ public class CallLogAdapterHelper implements ViewTreeObserver.OnPreDrawListener
         }
     };
 
+    public void setBusy(boolean isBusy) {
+        mBusy = isBusy;
+    }
+
+    public boolean isBusy(){
+        return mBusy;
+    }
+
     /**
      * Enqueues a request to look up the contact details for the given phone number.
      * <p>