commit c5a764f68c26edd9de0590d4b1797856fed7d2a2
author Jason Monk <jmonk@google.com> Fri Aug 22 12:51:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Aug 22 12:51:43 2014 +0000
tree 84b2efceeeddd05c79acf1152607ae319a4af73a
parent e585ce00159f856335ed07f4795d262db7cf3461
parent 266a91db57c6a6d957eb97a3e98ef0ee7c8a1261

am 266a91db: Merge "Change URI favorite resolving to use launch intents" into ub-now-porkchop

* commit '266a91db57c6a6d957eb97a3e98ef0ee7c8a1261':
  Change URI favorite resolving to use launch intents

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index af65536..842e0b0 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -1650,8 +1650,10 @@
                 resolved = systemApp;
             }
             final ActivityInfo info = resolved.activityInfo;
-            final Intent intent = buildMainIntent();
-            intent.setComponent(new ComponentName(info.packageName, info.name));
+            final Intent intent = mPackageManager.getLaunchIntentForPackage(info.packageName);
+            if (intent == null) {
+                return -1;
+            }
             intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK |
                     Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);