commit 43118986caea9b66ee96b8127e14c84609b3e02f
author Kenny Guy <kennyguy@google.com> Wed May 14 12:45:54 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 14 12:45:54 2014 +0000
tree 5fde4065940544398ace1a1889b99fc7db88ad5a
parent 0c28186282d0f48ab7350904918c940639a9b542
parent 792dd77e8c6fed786ef95da0cd9f5c342c9f1f6b

Merge "Return null from compat when resolveActivity returns null." into ub-now-nova

src/com/android/launcher3/compat/LauncherAppsCompatVL.java

diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
index c933712..21f2659 100644
--- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
+++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java
@@ -110,8 +110,13 @@
     }
 
     public LauncherActivityInfoCompat resolveActivity(Intent intent, UserHandleCompat user) {
-        return new LauncherActivityInfoCompatVL(ReflectUtils.invokeMethod(mLauncherApps,
-                        mResolveActivity, intent, user.getUser()));
+        Object activity = ReflectUtils.invokeMethod(mLauncherApps, mResolveActivity,
+                        intent, user.getUser());
+        if (activity != null) {
+            return new LauncherActivityInfoCompatVL(activity);
+        } else {
+            return null;
+        }
     }
 
     public void startActivityForProfile(ComponentName component, Rect sourceBounds,