From d5e47f6da5b08b13ecdfa7f1edc7e12aeb83fab9 Mon Sep 17 00:00:00 2001
From: Eric Erfanian <erfanian@google.com>
Date: Wed, 15 Mar 2017 14:41:07 -0700
Subject: Update Dialer source from latest green build.

* Refactor voicemail component
* Add new enriched calling components

Test: treehugger, manual aosp testing

Change-Id: I521a0f86327d4b42e14d93927c7d613044ed5942
---
 .../com/android/incallui/CallerInfoAsyncQuery.java | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'java/com/android/incallui/CallerInfoAsyncQuery.java')

diff --git a/java/com/android/incallui/CallerInfoAsyncQuery.java b/java/com/android/incallui/CallerInfoAsyncQuery.java
index f8d7ac65a..d620d4705 100644
--- a/java/com/android/incallui/CallerInfoAsyncQuery.java
+++ b/java/com/android/incallui/CallerInfoAsyncQuery.java
@@ -55,7 +55,7 @@ import java.util.Arrays;
 public class CallerInfoAsyncQuery {
 
   /** Interface for a CallerInfoAsyncQueryHandler result return. */
-  public interface OnQueryCompleteListener {
+  interface OnQueryCompleteListener {
 
     /** Called when the query is complete. */
     @MainThread
@@ -85,7 +85,7 @@ public class CallerInfoAsyncQuery {
   private CallerInfoAsyncQuery() {}
 
   @RequiresPermission(Manifest.permission.READ_CONTACTS)
-  public static void startQuery(
+  static void startQuery(
       final int token,
       final Context context,
       final CallerInfo info,
@@ -99,7 +99,7 @@ public class CallerInfoAsyncQuery {
         new OnQueryCompleteListener() {
           @Override
           public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
-            Log.d(LOG_TAG, "contactsProviderQueryCompleteListener done");
+            Log.d(LOG_TAG, "contactsProviderQueryCompleteListener onQueryComplete");
             // If there are no other directory queries, make sure that the listener is
             // notified of this result.  see b/27621628
             if ((ci != null && ci.contactExists)
@@ -112,6 +112,7 @@ public class CallerInfoAsyncQuery {
 
           @Override
           public void onDataLoaded(int token, Object cookie, CallerInfo ci) {
+            Log.d(LOG_TAG, "contactsProviderQueryCompleteListener onDataLoaded");
             listener.onDataLoaded(token, cookie, ci);
           }
         };
@@ -270,9 +271,9 @@ public class CallerInfoAsyncQuery {
   /* Directory lookup related code - END */
 
   /** Simple exception used to communicate problems with the query pool. */
-  public static class QueryPoolException extends SQLException {
+  private static class QueryPoolException extends SQLException {
 
-    public QueryPoolException(String error) {
+    QueryPoolException(String error) {
       super(error);
     }
   }
@@ -337,7 +338,7 @@ public class CallerInfoAsyncQuery {
       }
     }
 
-    public OnQueryCompleteListener newListener(long directoryId) {
+    OnQueryCompleteListener newListener(long directoryId) {
       return new DirectoryQueryCompleteListener(directoryId);
     }
 
@@ -351,11 +352,13 @@ public class CallerInfoAsyncQuery {
 
       @Override
       public void onDataLoaded(int token, Object cookie, CallerInfo ci) {
+        Log.d(LOG_TAG, "DirectoryQueryCompleteListener.onDataLoaded");
         mListener.onDataLoaded(token, cookie, ci);
       }
 
       @Override
       public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
+        Log.d(LOG_TAG, "DirectoryQueryCompleteListener.onQueryComplete");
         onDirectoryQueryComplete(token, cookie, ci, mDirectoryId);
       }
     }
@@ -446,7 +449,7 @@ public class CallerInfoAsyncQuery {
       mCallerInfo = null;
     }
 
-    protected void updateData(int token, Object cookie, Cursor cursor) {
+    void updateData(int token, Object cookie, Cursor cursor) {
       try {
         Log.d(this, "##### updateData() #####  for token: " + token);
 
@@ -549,9 +552,9 @@ public class CallerInfoAsyncQuery {
      * times before the query is complete. All accesses (listeners) must be queued up and informed
      * in order when the query is complete.
      */
-    protected class CallerInfoWorkerHandler extends WorkerHandler {
+    class CallerInfoWorkerHandler extends WorkerHandler {
 
-      public CallerInfoWorkerHandler(Looper looper) {
+      CallerInfoWorkerHandler(Looper looper) {
         super(looper);
       }
 
@@ -624,7 +627,7 @@ public class CallerInfoAsyncQuery {
             case EVENT_ADD_LISTENER:
               updateData(msg.arg1, cw, (Cursor) args.result);
               break;
-            default:
+            default: // fall out
           }
           Message reply = args.handler.obtainMessage(msg.what);
           reply.obj = args;
-- 
cgit v1.2.3