diff options
| author | Hui Yu <huiyu@google.com> | 2019-05-02 18:31:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-02 18:31:47 -0700 |
| commit | dad6ea20b2a158800a760850acb93f94ac1afe34 (patch) | |
| tree | 3977134d1f0c5d774cce1210b025491658ea1ab6 | |
| parent | c63468093bdffc462ff23a2b1f99a0fd46664ef5 (diff) | |
| parent | 77437eafaba4b385eb609f4ea25a3c7fc95021f6 (diff) | |
| download | ContactsProvider-dad6ea20b2a158800a760850acb93f94ac1afe34.tar.gz | |
Use strict comparison for russian phone numbers.
am: 77437eafab
Change-Id: I54002f403b8d7eb283206a56fc14a9fc5c2aab33
| -rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 163b65dd..01a08728 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -151,6 +151,11 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { private static final String USE_STRICT_PHONE_NUMBER_COMPARISON_KEY = "use_strict_phone_number_comparison"; + private static final String USE_STRICT_PHONE_NUMBER_COMPARISON_FOR_RUSSIAN_KEY + = "use_strict_phone_number_comparison_for_russian"; + + private static final String RUSSIAN_COUNTRY_CODE = "RU"; + public interface Tables { public static final String CONTACTS = "contacts"; public static final String DELETED_CONTACTS = "deleted_contacts"; @@ -1001,11 +1006,22 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { mContext = context; mSyncState = new SyncStateContentProviderHelper(); mCountryMonitor = new CountryMonitor(context); - mUseStrictPhoneNumberComparison = - DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CONTACTS_PROVIDER, - USE_STRICT_PHONE_NUMBER_COMPARISON_KEY, - resources.getBoolean( - com.android.internal.R.bool.config_use_strict_phone_number_comparation)); + + if (RUSSIAN_COUNTRY_CODE.equals(getCurrentCountryIso())) { + mUseStrictPhoneNumberComparison = + DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CONTACTS_PROVIDER, + USE_STRICT_PHONE_NUMBER_COMPARISON_FOR_RUSSIAN_KEY, + resources.getBoolean( + com.android.internal.R. + bool.config_use_strict_phone_number_comparation_for_russian)); + } else { + mUseStrictPhoneNumberComparison = + DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_CONTACTS_PROVIDER, + USE_STRICT_PHONE_NUMBER_COMPARISON_KEY, + resources.getBoolean( + com.android.internal.R. + bool.config_use_strict_phone_number_comparation)); + } } public SQLiteDatabase getDatabase(boolean writable) { |