diff options
author | Daniel Lehmann <lehmannd@google.com> | 2011-04-14 10:32:43 -0700 |
---|---|---|
committer | Daniel Lehmann <lehmannd@google.com> | 2011-04-14 10:32:43 -0700 |
commit | 64c69b650e264d6d3446aa89ce4ff467377dff76 (patch) | |
tree | 2ad9989afab19f439c26cd985be05c4f3787cfea /src/com/android/providers/contacts/ContactsDatabaseHelper.java | |
parent | 7d82ae92714f2132e3a0971d844ae8cdf10d76e7 (diff) | |
download | packages_providers_ContactsProvider-64c69b650e264d6d3446aa89ce4ff467377dff76.zip packages_providers_ContactsProvider-64c69b650e264d6d3446aa89ce4ff467377dff76.tar.gz packages_providers_ContactsProvider-64c69b650e264d6d3446aa89ce4ff467377dff76.tar.bz2 |
Don't create E164 numbers during update (country detector not ready)
Bug:4174796
Change-Id: I1e69253e6c9968f4d52b3213acc09395568a77c2
Diffstat (limited to 'src/com/android/providers/contacts/ContactsDatabaseHelper.java')
-rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index 3181375..bc76e24 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -2710,7 +2710,6 @@ import java.util.Locale; return; } - String mCountryIso = getCountryIso(); Cursor cursor = db.rawQuery( "SELECT _id, " + Phone.RAW_CONTACT_ID + ", " + Phone.NUMBER + " FROM " + Tables.DATA + @@ -2723,7 +2722,6 @@ import java.util.Locale; long dataID = cursor.getLong(0); long rawContactID = cursor.getLong(1); String number = cursor.getString(2); - String numberE164 = PhoneNumberUtils.formatNumberToE164(number, mCountryIso); String normalizedNumber = PhoneNumberUtils.normalizeNumber(number); if (!TextUtils.isEmpty(normalizedNumber)) { phoneValues.clear(); @@ -2733,13 +2731,6 @@ import java.util.Locale; phoneValues.put(PhoneLookupColumns.MIN_MATCH, PhoneNumberUtils.toCallerIDMinMatch(normalizedNumber)); db.insert(Tables.PHONE_LOOKUP, null, phoneValues); - - if (numberE164 != null && !numberE164.equals(normalizedNumber)) { - phoneValues.put(PhoneLookupColumns.NORMALIZED_NUMBER, numberE164); - phoneValues.put(PhoneLookupColumns.MIN_MATCH, - PhoneNumberUtils.toCallerIDMinMatch(numberE164)); - db.insert(Tables.PHONE_LOOKUP, null, phoneValues); - } } } } finally { |