Merge "Fix NPE in getTargetFileForDisplay" into lmp-mr1-dev
diff --git a/src/com/android/contacts/common/location/UpdateCountryService.java b/src/com/android/contacts/common/location/UpdateCountryService.java
index e339306..9403187 100644
--- a/src/com/android/contacts/common/location/UpdateCountryService.java
+++ b/src/com/android/contacts/common/location/UpdateCountryService.java
@@ -38,6 +38,10 @@
@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);