commit 20bdf9d2d21e1c82513f798ef4205b9d1713996d
author Paul Soulos <psoulos@google.com> Mon Jul 28 14:31:54 2014 -0700
committer Paul Soulos <psoulos@google.com> Mon Jul 28 23:01:41 2014 +0000
tree 612e9dde6d727de322c7c8df45f891dbc717b5be
parent 8bd49e409ec5c4e487fa03d20140121501477e48

Fixes crash in clicking entries without intent uri

Bug: 16559592
Change-Id: I47f8ad2b93c0e2435cac7d0c806d47d0f1b4d06c

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 5363e78..314fb34 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -290,20 +290,21 @@
             // so the exact usage type is not necessary in all cases
             String usageType = DataUsageFeedback.USAGE_TYPE_CALL;
 
-            final String scheme = intent.getData().getScheme();
-            if ((scheme != null && scheme.equals(CallUtil.SCHEME_SMSTO)) ||
+            final Uri intentUri = intent.getData();
+            if ((intentUri != null && intentUri.getScheme() != null &&
+                    intentUri.getScheme().equals(CallUtil.SCHEME_SMSTO)) ||
                     (intent.getType() != null && intent.getType().equals(MIMETYPE_SMS))) {
                 usageType = DataUsageFeedback.USAGE_TYPE_SHORT_TEXT;
             }
 
             // Data IDs start at 1 so anything less is invalid
             if (dataId > 0) {
-                final Uri uri = DataUsageFeedback.FEEDBACK_URI.buildUpon()
+                final Uri dataUsageUri = DataUsageFeedback.FEEDBACK_URI.buildUpon()
                         .appendPath(String.valueOf(dataId))
                         .appendQueryParameter(DataUsageFeedback.USAGE_TYPE, usageType)
                         .build();
                 final boolean successful = getContentResolver().update(
-                        uri, new ContentValues(), null, null) > 0;
+                        dataUsageUri, new ContentValues(), null, null) > 0;
                 if (!successful) {
                     Log.w(TAG, "DataUsageFeedback increment failed");
                 }