diff options
author | Jay Shrauner <shrauner@google.com> | 2013-10-09 09:53:35 -0700 |
---|---|---|
committer | Jay Shrauner <shrauner@google.com> | 2013-10-09 09:53:35 -0700 |
commit | 116f57fe659db05186ce85aa192bd65a974684e9 (patch) | |
tree | 952fa8a44dfa0ea9fee8c616d93c14ccb8059ff9 | |
parent | a16c2509fa398159988861a3fc8408b493fa445b (diff) | |
download | ContactsProvider-kitkat-cts-release.tar.gz |
Catch potential NPEandroid-cts-4.4_r4android-cts-4.4_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9kitkat-releasekitkat-cts-releasekitkat-cts-dev
Catch case where country detector might return a null country
Bug:11139097
Change-Id: I5d4841a8f8d852e18cff1f9c359d5e005c7e58b8
-rw-r--r-- | src/com/android/providers/contacts/ContactsDatabaseHelper.java | 6 | ||||
-rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java index fedb5648..4cd01eb9 100644 --- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java +++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java @@ -5058,12 +5058,6 @@ public class ContactsDatabaseHelper extends SQLiteOpenHelper { return sb.toString(); } - protected String getCountryIso() { - CountryDetector detector = - (CountryDetector) mContext.getSystemService(Context.COUNTRY_DETECTOR); - return detector.detectCountry().getCountryIso(); - } - public void deleteStatusUpdate(long dataId) { if (mStatusUpdateDelete == null) { mStatusUpdateDelete = getWritableDatabase().compileStatement( diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index 85c97468..2f6bf45d 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -7014,7 +7014,7 @@ public class ContactsProvider2 extends AbstractContactsProvider if (isPhoneNumber) { phoneNumber = PhoneNumberUtils.normalizeNumber(filter); numberE164 = PhoneNumberUtils.formatNumberToE164(phoneNumber, - mDbHelper.get().getCountryIso()); + mDbHelper.get().getCurrentCountryIso()); } } |