diff options
| author | Jason Monk <jmonk@google.com> | 2014-08-21 18:45:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-21 18:45:02 +0000 |
| commit | 266a91db57c6a6d957eb97a3e98ef0ee7c8a1261 (patch) | |
| tree | 84b2efceeeddd05c79acf1152607ae319a4af73a | |
| parent | ffe83f13319cdb833a25596d47cf1af098cc4c60 (diff) | |
| parent | c3009c06d9e09054191a207349e08a2e7660a776 (diff) | |
| download | android_packages_apps_Trebuchet-266a91db57c6a6d957eb97a3e98ef0ee7c8a1261.tar.gz android_packages_apps_Trebuchet-266a91db57c6a6d957eb97a3e98ef0ee7c8a1261.tar.bz2 android_packages_apps_Trebuchet-266a91db57c6a6d957eb97a3e98ef0ee7c8a1261.zip | |
Merge "Change URI favorite resolving to use launch intents" into ub-now-porkchop
| -rw-r--r-- | src/com/android/launcher3/LauncherProvider.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java index af655367a..842e0b0ff 100644 --- a/src/com/android/launcher3/LauncherProvider.java +++ b/src/com/android/launcher3/LauncherProvider.java @@ -1650,8 +1650,10 @@ public class LauncherProvider extends ContentProvider { 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); |