commit 1f9f48d413810c01b4daaebfe398a1bb875ea10a
author Jay Shrauner <shrauner@google.com> Thu Oct 23 18:24:27 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 23 18:24:29 2014 +0000
tree d09332e5485bc0da786b5aa3520f60482a5994e9
parent 593e5a7f2551b7946ada9913408f649e530202c8
parent 417309a770568d7b278abc91c46a739020e48157

Merge "Fix ActivityNotFound crash" into lmp-mr1-dev

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 96a73a9..9cd854a 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1474,27 +1474,27 @@
                 iconResourceId = R.drawable.ic_place_24dp;
             }
         } else if (dataItem instanceof SipAddressDataItem) {
-            if (PhoneCapabilityTester.isSipPhone(context)) {
-                final SipAddressDataItem sip = (SipAddressDataItem) dataItem;
-                final String address = sip.getSipAddress();
-                if (!TextUtils.isEmpty(address)) {
-                    primaryContentDescription.append(res.getString(R.string.call_other)).append(
-                            " ");
+            final SipAddressDataItem sip = (SipAddressDataItem) dataItem;
+            final String address = sip.getSipAddress();
+            if (!TextUtils.isEmpty(address)) {
+                primaryContentDescription.append(res.getString(R.string.call_other)).append(
+                        " ");
+                if (PhoneCapabilityTester.isSipPhone(context)) {
                     final Uri callUri = Uri.fromParts(PhoneAccount.SCHEME_SIP, address, null);
                     intent = CallUtil.getCallIntent(callUri);
-                    header = address;
-                    entryContextMenuInfo = new EntryContextMenuInfo(header,
-                            res.getString(R.string.phoneLabelsGroup), dataItem.getMimeType(),
-                            dataItem.getId(), dataItem.isSuperPrimary());
-                    if (sip.hasKindTypeColumn(kind)) {
-                        text = SipAddress.getTypeLabel(res,
-                                sip.getKindTypeColumn(kind), sip.getLabel()).toString();
-                        primaryContentDescription.append(text).append(" ");
-                    }
-                    primaryContentDescription.append(header);
-                    icon = res.getDrawable(R.drawable.ic_dialer_sip_black_24dp);
-                    iconResourceId = R.drawable.ic_dialer_sip_black_24dp;
                 }
+                header = address;
+                entryContextMenuInfo = new EntryContextMenuInfo(header,
+                        res.getString(R.string.phoneLabelsGroup), dataItem.getMimeType(),
+                        dataItem.getId(), dataItem.isSuperPrimary());
+                if (sip.hasKindTypeColumn(kind)) {
+                    text = SipAddress.getTypeLabel(res,
+                            sip.getKindTypeColumn(kind), sip.getLabel()).toString();
+                    primaryContentDescription.append(text).append(" ");
+                }
+                primaryContentDescription.append(header);
+                icon = res.getDrawable(R.drawable.ic_dialer_sip_black_24dp);
+                iconResourceId = R.drawable.ic_dialer_sip_black_24dp;
             }
         } else if (dataItem instanceof StructuredNameDataItem) {
             final String givenName = ((StructuredNameDataItem) dataItem).getGivenName();