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

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());
             }
         }