commit 32777801796c1b1793491d44161da41327e07f53
author Paul Soulos <psoulos@google.com> Wed Jul 09 13:27:07 2014 -0700
committer Paul Soulos <psoulos@google.com> Wed Jul 09 20:37:58 2014 +0000
tree 851b78b6154a326b89257af3a037eb7a52dbb45b
parent 8ab5d0a630da1909beb9d3414d2dfc13c51fec6e

Fixes NPE with 3p entries in QuickContact

Bug: 16169465
Change-Id: Ia106ca42ac6e267d314b2100bd9101998c13ddff

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 4e9d036..87405fd 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -285,7 +285,8 @@
             // so the exact usage type is not necessary in all cases
             String usageType = DataUsageFeedback.USAGE_TYPE_CALL;
 
-            if (intent.getData().getScheme().equals(SCHEME_SMSTO) ||
+            final String scheme = intent.getData().getScheme();
+            if ((scheme != null && scheme.equals(SCHEME_SMSTO)) ||
                     (intent.getType() != null && intent.getType().equals(MIMETYPE_SMS))) {
                 usageType = DataUsageFeedback.USAGE_TYPE_SHORT_TEXT;
             }