From a6896116a51700ce134d801c632dea6a21f5d936 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Tue, 8 Dec 2015 17:16:51 -0800
Subject: Fix for Google Caller ID not working

Make sure to fire onQueryComplete callback if no directories
found.

While in here, fix a typo: mIsListernerCalled -> mIsListenerCalled

Bug: 25517103
Change-Id: Ic6fa7c221509d1b6fee8a9e16c1862a84695bed8
---
 InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'InCallUI')

diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
index 97a95ac50..1a0cd9611 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
@@ -410,6 +410,9 @@ public class CallerInfoAsyncQuery {
         long[] directoryIds = getDirectoryIds(context);
         int size = directoryIds.length;
         if (size == 0) {
+            if (listener != null) {
+                listener.onQueryComplete(token, cookie, info);
+            }
             return;
         }
 
@@ -467,13 +470,13 @@ public class CallerInfoAsyncQuery {
 
     private static final class DirectoryQueryCompleteListener implements OnQueryCompleteListener {
         int mCount;
-        boolean mIsListernerCalled;
+        boolean mIsListenerCalled;
         OnQueryCompleteListener mListener;
 
         DirectoryQueryCompleteListener(int size, OnQueryCompleteListener listener)  {
             mCount = size;
             mListener = listener;
-            mIsListernerCalled = false;
+            mIsListenerCalled = false;
         }
 
         @Override
@@ -481,8 +484,8 @@ public class CallerInfoAsyncQuery {
             boolean shouldCallListener = false;
             synchronized (this) {
                 mCount = mCount - 1;
-                if (!mIsListernerCalled && (ci.contactExists || mCount == 0)) {
-                    mIsListernerCalled = true;
+                if (!mIsListenerCalled && (ci.contactExists || mCount == 0)) {
+                    mIsListenerCalled = true;
                     shouldCallListener = true;
                 }
             }
-- 
cgit v1.2.3