commit 2a2cc48c03d28c7de8318d979de25932fc4d2bab
author Marcus Hagerott <mhagerott@google.com> Sat Oct 29 01:40:46 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 29 01:40:46 2016 +0000
tree 9371b08d9ba81bb9fc83403b36c2ba83d55589db
parent 1332b2105356c7e61d4a2ae77446c22cdbe8c739
parent 677ee2bd9c37f3bc4cbfd1f05b3c93f12a7299f3

Merge "Fix crash when QuickContactActivity opened from dialer" into ub-contactsdialer-h-dev

src/com/android/contacts/DynamicShortcuts.java

diff --git a/src/com/android/contacts/DynamicShortcuts.java b/src/com/android/contacts/DynamicShortcuts.java
index f5363f6..fce2f8b 100644
--- a/src/com/android/contacts/DynamicShortcuts.java
+++ b/src/com/android/contacts/DynamicShortcuts.java
@@ -476,7 +476,7 @@
     }
 
     public static void reportShortcutUsed(Context context, String lookupKey) {
-        if (!CompatUtils.isLauncherShortcutCompatible()) return;
+        if (!CompatUtils.isLauncherShortcutCompatible() || lookupKey == null) return;
         final ShortcutManager shortcutManager = (ShortcutManager) context
                 .getSystemService(Context.SHORTCUT_SERVICE);
         shortcutManager.reportShortcutUsed(lookupKey);

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 3597607..52c66d5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2275,7 +2275,7 @@
                     return;
                 }
 
-                if (!mIsRecreatedInstance && !mShortcutUsageReported) {
+                if (!mIsRecreatedInstance && !mShortcutUsageReported && data != null) {
                     mShortcutUsageReported = true;
                     DynamicShortcuts.reportShortcutUsed(QuickContactActivity.this,
                             data.getLookupKey());