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

* commit '43118986caea9b66ee96b8127e14c84609b3e02f':
  Return null from compat when resolveActivity returns null.
This commit is contained in:
Kenny Guy authored and Android Git Automerger committed 2014-05-14 12:48:55 +00:00
commit d12f7f0b49
1 file changed
+7 -2
@@ -110,8 +110,13 @@ public class LauncherAppsCompatVL extends LauncherAppsCompat {
}
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,