Merge "Fix for Google Caller ID not working" into ub-contactsdialer-b-dev

am: 9294fe9eeb

* commit '9294fe9eeb054290f5d4290c53c4b47225bf01b6':
  Fix for Google Caller ID not working

1 files changed, 7 insertions, 4 deletions

diff --git a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
index 3467684f5..bf254c605 100644
--- a/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/InCallUI/src/com/android/incallui/CallerInfoAsyncQuery.java
@@ -409,6 +409,9 @@ public class CallerInfoAsyncQuery {
         long[] directoryIds = getDirectoryIds(context);
         int size = directoryIds.length;
         if (size == 0) {
+            if (listener != null) {
+                listener.onQueryComplete(token, cookie, info);
+            }
             return;
         }
 
@@ -464,13 +467,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
@@ -478,8 +481,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;
                 }
             }