Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2e8bb06 authored by mtwebster's avatar mtwebster
Browse files

Merge branch 'issue2034' from loganj finally ending my misery. The previous 2... 

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.
parent 48c245f8

src/com/android/contacts/ViewContactActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -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;