summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/common/location/UpdateCountryService.java
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-03-24 13:36:45 -0700
committerSteve Kondik <steve@cyngn.com>2015-03-25 03:25:09 -0700
commit90b89eda4c38deeb39a0c961b8149a04d553051b (patch)
tree2988137a54c868d49cae08a99a86bbf36912ba88 /src/com/android/contacts/common/location/UpdateCountryService.java
parent516b8b57f2a445afe1b1ef212e9abfa4549a13c7 (diff)
parent7c27248f86795222adc8b87543eda5c6148610db (diff)
downloadandroid_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.tar.gz
android_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.tar.bz2
android_packages_apps_ContactsCommon-90b89eda4c38deeb39a0c961b8149a04d553051b.zip
Merge branch 'lollipop-mr1-release' of https://android.googlesource.com/platform/packages/apps/ContactsCommon into cm-12.1
Change-Id: I271972eb6db4d6c5cc620a1adb26b1f06beaf1b4
Diffstat (limited to 'src/com/android/contacts/common/location/UpdateCountryService.java')
-rw-r--r--src/com/android/contacts/common/location/UpdateCountryService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/contacts/common/location/UpdateCountryService.java b/src/com/android/contacts/common/location/UpdateCountryService.java
index e339306f..9403187e 100644
--- a/src/com/android/contacts/common/location/UpdateCountryService.java
+++ b/src/com/android/contacts/common/location/UpdateCountryService.java
@@ -38,6 +38,10 @@ public class UpdateCountryService extends IntentService {
@Override
protected void onHandleIntent(Intent intent) {
+ if (intent == null) {
+ Log.d(TAG, "onHandleIntent: could not handle null intent");
+ return;
+ }
if (ACTION_UPDATE_COUNTRY.equals(intent.getAction())) {
final Location location = (Location) intent.getParcelableExtra(KEY_INTENT_LOCATION);
final String country = getCountryFromLocation(getApplicationContext(), location);