commit 677ee2bd9c37f3bc4cbfd1f05b3c93f12a7299f3
author Marcus Hagerott <mhagerott@google.com> Fri Oct 28 15:31:55 2016 -0700
committer Marcus Hagerott <mhagerott@google.com> Fri Oct 28 15:31:55 2016 -0700
tree 04a51be5e2d35c558cc06341813404a76a8369c3
parent 8fad26543446aea249c77152dd766933e5fec8dc

Fix crash when QuickContactActivity opened from dialer

DynamicShortcuts did not do a null check on the lookup key for usage
reporting.

Test
Manual: verify app doesn't crash when opening a non-contact number from dialer

Bug 32512382

Change-Id: Idff54205b336a4976914f29d352d26b80c3ff21d

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());