Reuse SmartDialNameMatcher instance in SmartDialNumberListAdapter.

Change-Id: I10e4226c5ec5b24ba6ee0d02b88327f0624955c6

2 files changed, 9 insertions, 4 deletions

diff --git a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
index 43aeb26ec..01268641d 100644
--- a/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
+++ b/src/com/android/dialer/dialpad/SmartDialNameMatcher.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
  */
 public class SmartDialNameMatcher {
 
-    private final String mQuery;
+    private String mQuery;
 
     // Whether or not we allow matches like 57 - (J)ohn (S)mith
     private static final boolean ALLOW_INITIAL_MATCH = true;
@@ -416,6 +416,10 @@ public class SmartDialNameMatcher {
         return new ArrayList<SmartDialMatchPosition>(mMatchPositions);
     }
 
+    public void setQuery(String query) {
+        mQuery = query;
+    }
+
     public String getNameMatchPositionsInString() {
         return mNameMatchMask;
     }
diff --git a/src/com/android/dialer/list/SmartDialNumberListAdapter.java b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
index 962d8ee43..25d442e0c 100644
--- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java
+++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java
@@ -46,6 +46,8 @@ public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter {
 
     public SmartDialNumberListAdapter(Context context) {
         super(context);
+        mNameMatcher = new SmartDialNameMatcher("", SmartDialPrefix.getMap());
+
         if (DEBUG) {
             Log.v(TAG, "Constructing List Adapter");
         }
@@ -60,12 +62,11 @@ public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter {
         }
 
         if (getQueryString() == null) {
-            mNameMatcher = new SmartDialNameMatcher("", SmartDialPrefix.getMap());
             loader.configureQuery("");
+            mNameMatcher.setQuery("");
         } else {
             loader.configureQuery(getQueryString());
-            mNameMatcher = new SmartDialNameMatcher(PhoneNumberUtils.normalizeNumber(
-                    getQueryString()), SmartDialPrefix.getMap());
+            mNameMatcher.setQuery(PhoneNumberUtils.normalizeNumber(getQueryString()));
         }
     }