diff options
| author | Jay Shrauner <shrauner@google.com> | 2013-10-09 22:41:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-09 22:41:52 +0000 |
| commit | 4e9d508e08b3b7fe929a64d98d11a372a4a44045 (patch) | |
| tree | d3ae430d9908420501202090b291b2dc3ff0878e /src/com/android/incallui/CallerInfoAsyncQuery.java | |
| parent | 8f7a4eb36ceaa19e19c4a4d0e71cbad4cc3c934c (diff) | |
| parent | 1c85bef1f4ee97a3443d130bdff178ba4db1539f (diff) | |
| download | packages_apps_InCallUI-4e9d508e08b3b7fe929a64d98d11a372a4a44045.tar.gz packages_apps_InCallUI-4e9d508e08b3b7fe929a64d98d11a372a4a44045.tar.bz2 packages_apps_InCallUI-4e9d508e08b3b7fe929a64d98d11a372a4a44045.zip | |
Merge "Catch potential NPE" into klp-dev
Diffstat (limited to 'src/com/android/incallui/CallerInfoAsyncQuery.java')
| -rw-r--r-- | src/com/android/incallui/CallerInfoAsyncQuery.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/incallui/CallerInfoAsyncQuery.java b/src/com/android/incallui/CallerInfoAsyncQuery.java index c9d282b2..c09baf21 100644 --- a/src/com/android/incallui/CallerInfoAsyncQuery.java +++ b/src/com/android/incallui/CallerInfoAsyncQuery.java @@ -20,7 +20,6 @@ import android.content.AsyncQueryHandler; import android.content.Context; import android.database.Cursor; import android.database.SQLException; -import android.location.CountryDetector; import android.net.Uri; import android.os.Handler; import android.os.Looper; @@ -269,11 +268,9 @@ public class CallerInfoAsyncQuery { // Use the number entered by the user for display. if (!TextUtils.isEmpty(cw.number)) { - CountryDetector detector = (CountryDetector) mQueryContext.getSystemService( - Context.COUNTRY_DETECTOR); mCallerInfo.phoneNumber = PhoneNumberUtils.formatNumber(cw.number, mCallerInfo.normalizedNumber, - detector.detectCountry().getCountryIso()); + CallerInfo.getCurrentCountryIso(mQueryContext)); } } |