1 files changed, 14 insertions, 25 deletions
diff --git a/src/com/android/dialer/lookup/cyngn/CyngnChineseReverseLookup.java b/src/com/android/dialer/lookup/cyngn/CyngnChineseReverseLookup.java
index 4b4aa6d33..355208a18 100644
--- a/src/com/android/dialer/lookup/cyngn/CyngnChineseReverseLookup.java
+++ b/src/com/android/dialer/lookup/cyngn/CyngnChineseReverseLookup.java
@@ -22,7 +22,6 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.util.Log;
-import android.util.Pair;
 import com.android.dialer.calllog.ContactInfo;
 import com.android.dialer.lookup.ContactBuilder;
 import com.android.dialer.lookup.ReverseLookup;
@@ -36,6 +35,8 @@ public class CyngnChineseReverseLookup extends ReverseLookup {
     private static final int COMMON_CHINESE_PHONE_NUMBER_AREANO_END = 5;
 
     private static final boolean DEBUG = false;
+    private static final Uri PROVIDER_URI =
+            Uri.parse("content://com.cyngn.chineselocationlookup.provider");
 
     public CyngnChineseReverseLookup(Context context) {
     }
@@ -48,12 +49,9 @@ public class CyngnChineseReverseLookup extends ReverseLookup {
      * @param formattedNumber  The formatted phone number
      * @return The phone number info object
      */
-    public Pair<ContactInfo, Object> lookupNumber(Context context,
-                                                  String normalizedNumber, String formattedNumber) {
-        String displayName;
-
-        displayName = queryProvider(context, normalizedNumber);
-
+    public ContactInfo lookupNumber(Context context,
+            String normalizedNumber, String formattedNumber) {
+        String displayName = queryProvider(context, normalizedNumber);
         if (displayName == null) {
             return null;
         }
@@ -66,19 +64,11 @@ public class CyngnChineseReverseLookup extends ReverseLookup {
         ContactBuilder builder = new ContactBuilder(
                 ContactBuilder.REVERSE_LOOKUP,
                 normalizedNumber, formattedNumber);
-
-        ContactBuilder.Name n = new ContactBuilder.Name();
-        n.displayName = displayName;
-        builder.setName(n);
-
-        ContactBuilder.PhoneNumber pn = new ContactBuilder.PhoneNumber();
-        pn.number = number;
-        pn.type = ContactsContract.CommonDataKinds.Phone.TYPE_MAIN;
-        builder.addPhoneNumber(pn);
-
+        builder.setName(ContactBuilder.Name.createDisplayName(displayName));
+        builder.addPhoneNumber(ContactBuilder.PhoneNumber.createMainNumber(number));
         builder.setPhotoUri(ContactBuilder.PHOTO_URI_BUSINESS);
 
-        return Pair.create(builder.build(), null);
+        return builder.build();
     }
 
     private String queryProvider(Context context, String normalizedNumber) {
@@ -91,20 +81,19 @@ public class CyngnChineseReverseLookup extends ReverseLookup {
                 COMMON_CHINESE_PHONE_NUMBER_AREANO_END);
 
         ContentResolver resolver = context.getContentResolver();
-        Cursor cursor = resolver.query(Uri.parse("content://com.cyngn.chineselocationlookup.provider"),
+        Cursor cursor = context.getContentResolver().query(PROVIDER_URI,
                 null, null, new String[] { areaPrefix }, null);
-
-        String city = null;
+        if (cursor == null) {
+            return null;
+        }
 
         try {
             if (cursor.moveToFirst()) {
-                city = cursor.getString(2);
+                return cursor.getString(2);
             }
-        } catch (NullPointerException e) {
-            return null;
         } finally {
             cursor.close();
-            return city;
         }
+        return null;
     }
 }