diff options
| author | Danny Baumann <dannybaumann@web.de> | 2015-06-04 09:20:30 +0200 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-06-18 07:05:58 +0000 |
| commit | 0c4d805e8d6f087ef84653ef239e1ce7a585f8e9 (patch) | |
| tree | 5d72595529b85fa42ba8f188ed7fedd65a628951 | |
| parent | f81b4288155b563ecf712339ea319727ec94694a (diff) | |
| download | android_packages_apps_Dialer-0c4d805e8d6f087ef84653ef239e1ce7a585f8e9.tar.gz android_packages_apps_Dialer-0c4d805e8d6f087ef84653ef239e1ce7a585f8e9.tar.bz2 android_packages_apps_Dialer-0c4d805e8d6f087ef84653ef239e1ce7a585f8e9.zip | |
Ensure the smart dial name matcher is initialized in onStart().
Otherwise SmartDialPrefix.getMap() might not be initialized yet.
JIRA: NIGHTLIES-1279
Change-Id: If3aca2809faf0c1f379518096a76f17d357fb8e2
| -rw-r--r-- | src/com/android/dialer/list/SmartDialNumberListAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/dialer/list/SmartDialNumberListAdapter.java b/src/com/android/dialer/list/SmartDialNumberListAdapter.java index f2cd1a69a..a0d74844e 100644 --- a/src/com/android/dialer/list/SmartDialNumberListAdapter.java +++ b/src/com/android/dialer/list/SmartDialNumberListAdapter.java @@ -48,7 +48,6 @@ public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter { public SmartDialNumberListAdapter(Context context) { super(context); - mNameMatcher = new SmartDialNameMatcher("", SmartDialPrefix.getMap(), context); if (DEBUG) { Log.v(TAG, "Constructing List Adapter"); @@ -63,6 +62,8 @@ public class SmartDialNumberListAdapter extends DialerPhoneNumberListAdapter { Log.v(TAG, "Configure Loader with query" + getQueryString()); } + mNameMatcher = new SmartDialNameMatcher("", SmartDialPrefix.getMap(), getContext()); + if (getQueryString() == null) { loader.configureQuery(""); mNameMatcher.setQuery(""); |