commit 116f57fe659db05186ce85aa192bd65a974684e9
author Jay Shrauner <shrauner@google.com> Wed Oct 09 09:53:35 2013 -0700
committer Jay Shrauner <shrauner@google.com> Wed Oct 09 09:53:35 2013 -0700
tree 952fa8a44dfa0ea9fee8c616d93c14ccb8059ff9
parent a16c2509fa398159988861a3fc8408b493fa445b

Catch potential NPE

Catch case where country detector might return a null country

Bug:11139097
Change-Id: I5d4841a8f8d852e18cff1f9c359d5e005c7e58b8

src/com/android/providers/contacts/ContactsDatabaseHelper.java

diff --git a/src/com/android/providers/contacts/ContactsDatabaseHelper.java b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
index fedb564..4cd01eb 100644
--- a/src/com/android/providers/contacts/ContactsDatabaseHelper.java
+++ b/src/com/android/providers/contacts/ContactsDatabaseHelper.java
@@ -5058,12 +5058,6 @@
         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(

src/com/android/providers/contacts/ContactsProvider2.java

diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java
index 85c9746..2f6bf45 100644
--- a/src/com/android/providers/contacts/ContactsProvider2.java
+++ b/src/com/android/providers/contacts/ContactsProvider2.java
@@ -7014,7 +7014,7 @@
             if (isPhoneNumber) {
                 phoneNumber = PhoneNumberUtils.normalizeNumber(filter);
                 numberE164 = PhoneNumberUtils.formatNumberToE164(phoneNumber,
-                        mDbHelper.get().getCountryIso());
+                        mDbHelper.get().getCurrentCountryIso());
             }
         }