diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-14 02:25:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-14 02:25:43 -0700 |
| commit | 750e355b43949efa8274bba8bc60c56cf298baef (patch) | |
| tree | 6476b95549be86d42f8646ae2b98b98834160d23 | |
| parent | 3631fda3e922bf54fd0df0db5694c52ec0c1defd (diff) | |
| parent | d16b8291bb27220f8563a646b5a9eb176cf9ea7b (diff) | |
| download | android_packages_apps_ContactsCommon-750e355b43949efa8274bba8bc60c56cf298baef.tar.gz android_packages_apps_ContactsCommon-750e355b43949efa8274bba8bc60c56cf298baef.tar.bz2 android_packages_apps_ContactsCommon-750e355b43949efa8274bba8bc60c56cf298baef.zip | |
Merge "Fix NPE when intent is null"
| -rw-r--r-- | src/com/android/contacts/common/location/UpdateCountryService.java | 4 |
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); |