diff options
| author | mtwebster <miketwebster@gmail.com> | 2010-08-22 20:21:16 -0400 |
|---|---|---|
| committer | mtwebster <miketwebster@gmail.com> | 2010-08-22 20:59:47 -0400 |
| commit | a2e8bb060f4726b572afd017db9450757055a00d (patch) | |
| tree | 0da2ccc12640124ee46c32dc6ed8272841810a5a /src | |
| parent | 48c245f84a6e6ec415f8d40df3d20a01eb292934 (diff) | |
| download | packages_apps_Contacts-a2e8bb060f4726b572afd017db9450757055a00d.tar.gz packages_apps_Contacts-a2e8bb060f4726b572afd017db9450757055a00d.tar.bz2 packages_apps_Contacts-a2e8bb060f4726b572afd017db9450757055a00d.zip | |
Merge branch 'issue2034' from loganj finally ending my misery. The previous 2 commits never actually prevent the intValue() call of 'type' from throwing a NPE.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/contacts/ViewContactActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java index 18aa87387..f06ff4124 100644 --- a/src/com/android/contacts/ViewContactActivity.java +++ b/src/com/android/contacts/ViewContactActivity.java @@ -951,7 +951,8 @@ public class ViewContactActivity extends Activity Integer type = entryValues.getAsInteger(Phone.TYPE); //Wysie: Bug here, entry.type always returns -1. - if (/*entry.type*/type.intValue() == (CommonDataKinds.Phone.TYPE_MOBILE) || mShowSmsLinksForAllPhones) { + + if ((type != null && type == CommonDataKinds.Phone.TYPE_MOBILE) || mShowSmsLinksForAllPhones) { // Add an SMS entry if (kind.iconAltRes > 0) { entry.secondaryActionIcon = kind.iconAltRes; |