diff options
| author | Kenny Guy <kennyguy@google.com> | 2014-05-14 12:45:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-14 12:45:54 +0000 |
| commit | 43118986caea9b66ee96b8127e14c84609b3e02f (patch) | |
| tree | 5fde4065940544398ace1a1889b99fc7db88ad5a /src/com | |
| parent | 0c28186282d0f48ab7350904918c940639a9b542 (diff) | |
| parent | 792dd77e8c6fed786ef95da0cd9f5c342c9f1f6b (diff) | |
| download | android_packages_apps_Trebuchet-43118986caea9b66ee96b8127e14c84609b3e02f.tar.gz android_packages_apps_Trebuchet-43118986caea9b66ee96b8127e14c84609b3e02f.tar.bz2 android_packages_apps_Trebuchet-43118986caea9b66ee96b8127e14c84609b3e02f.zip | |
Merge "Return null from compat when resolveActivity returns null." into ub-now-nova
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/android/launcher3/compat/LauncherAppsCompatVL.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java index c933712a9..21f2659ba 100644 --- a/src/com/android/launcher3/compat/LauncherAppsCompatVL.java +++ b/src/com/android/launcher3/compat/LauncherAppsCompatVL.java @@ -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, |