commit 29013fb838a7065f93567be26a7e3e0f3a10def4
author Marcus Hagerott <mhagerott@google.com> Sat Oct 29 01:50:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Sat Oct 29 01:50:25 2016 +0000
tree 21075b00bd92e0102b6b58d41582493747d53f9b
parent 793b40f358356ca14b34f8f601ae8c11b89da9bf
parent 677ee2bd9c37f3bc4cbfd1f05b3c93f12a7299f3

Fix crash when QuickContactActivity opened from dialer
am: 677ee2bd9c

Change-Id: I43b18890fa22788656ab62bb32049355b5412711

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