commit 8ac2ff95dd68378f6f5c60e12fcb3552e5b9a7e1
author Jay Shrauner <shrauner@google.com> Thu Jan 16 15:26:44 2014 -0800
committer Jay Shrauner <shrauner@google.com> Sat Mar 01 19:40:23 2014 +0000
tree 331b4a2d109d53ce28ad94253a64b415898e1df3
parent b0b153f5fe5833d1a3b102e93e6e27481a90e4f7

Fix synchronization in onNotNullableQueryComplete

Synchronize onNotNullableQueryComplete to protect mCallLogCursor
and mCallsRequestId.

Bug:12591404
Change-Id: Ib1de73d2da0f14875a98b25113a132681da0beaa
(cherry picked from commit 964222de32bfb2ca0ff06b445bcb25c0bb936d2f)

src/com/android/dialer/calllog/CallLogQueryHandler.java

diff --git a/src/com/android/dialer/calllog/CallLogQueryHandler.java b/src/com/android/dialer/calllog/CallLogQueryHandler.java
index def3c97..3992676 100644
--- a/src/com/android/dialer/calllog/CallLogQueryHandler.java
+++ b/src/com/android/dialer/calllog/CallLogQueryHandler.java
@@ -258,7 +258,7 @@
     }
 
     @Override
-    protected void onNotNullableQueryComplete(int token, Object cookie, Cursor cursor) {
+    protected synchronized void onNotNullableQueryComplete(int token, Object cookie, Cursor cursor) {
         if (token == QUERY_CALLLOG_TOKEN) {
             int requestId = ((Integer) cookie).intValue();
             if (requestId != mCallsRequestId) {