commit c4839d37dbf045e2ce585327f63aab9e9ed2234a
author Hyunyoung Song <hyunyoungs@google.com> Wed May 11 20:34:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 11 20:34:15 2016 +0000
tree 460b99437f9518ab0312eec68891dae7c061f96c
parent e36f2a429de7959311bb2d3e06138edcde84b2b1
parent 4dcd8ffecc5bbdc5c7496cea4eb6808f4026bf9e

Merge "Fixing a crash/ Launcher3 doesn\'t have predicted apps" into ub-launcher3-calgary
am: 4dcd8ffecc

* commit '4dcd8ffecc5bbdc5c7496cea4eb6808f4026bf9e':
  Fixing a crash/ Launcher3 doesn't have predicted apps

Change-Id: I999591077dfd0c55f9a97533044d60864018c97b

src/com/android/launcher3/logging/UserEventDispatcher.java

diff --git a/src/com/android/launcher3/logging/UserEventDispatcher.java b/src/com/android/launcher3/logging/UserEventDispatcher.java
index c06dc19..e9a897e 100644
--- a/src/com/android/launcher3/logging/UserEventDispatcher.java
+++ b/src/com/android/launcher3/logging/UserEventDispatcher.java
@@ -106,8 +106,10 @@
         if (cn != null) {
             event.srcTarget[idx].packageNameHash = cn.getPackageName().hashCode();
             event.srcTarget[idx].componentHash = cn.hashCode();
-            event.srcTarget[idx].predictedRank = mPredictedApps.indexOf(
-                    new ComponentKey(cn, itemInfo.user));
+            if (mPredictedApps != null) {
+                event.srcTarget[idx].predictedRank = mPredictedApps.indexOf(
+                        new ComponentKey(cn, itemInfo.user));
+            }
         }
 
         // Fill in the duration of time spent navigating in Launcher and the container.