diff options
| author | Winson Chung <winsonc@google.com> | 2013-08-30 16:38:00 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-08-30 16:38:40 -0700 |
| commit | 68fd3c33daf7a6d4de287f8691306a55fa54706c (patch) | |
| tree | c6d3f1409b780aaabfda08c715bc3ecb6cb196da /src | |
| parent | 8b3cd79082043a08c319f1550679d4078b7d509c (diff) | |
| download | android_packages_apps_Trebuchet-68fd3c33daf7a6d4de287f8691306a55fa54706c.tar.gz android_packages_apps_Trebuchet-68fd3c33daf7a6d4de287f8691306a55fa54706c.tar.bz2 android_packages_apps_Trebuchet-68fd3c33daf7a6d4de287f8691306a55fa54706c.zip | |
Fixing issue where shortcuts to standard android intents were getting pruned.
Change-Id: Ie5b83f0240a72813e33d528b62f74e69c3807d55
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index 1c98522bc..338b9c3d5 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -1725,7 +1725,7 @@ public class LauncherModel extends BroadcastReceiver { try { intent = Intent.parseUri(intentDescription, 0); ComponentName cn = intent.getComponent(); - if (!isValidPackageComponent(manager, cn)) { + if (cn != null && !isValidPackageComponent(manager, cn)) { if (!mAppsCanBeOnRemoveableStorage) { // Log the invalid package, and remove it from the db Uri uri = LauncherSettings.Favorites.getContentUri(id, @@ -2718,7 +2718,7 @@ public class LauncherModel extends BroadcastReceiver { Cursor c, int iconIndex, int titleIndex, HashMap<Object, CharSequence> labelCache) { ComponentName componentName = intent.getComponent(); final ShortcutInfo info = new ShortcutInfo(); - if (!isValidPackageComponent(manager, componentName)) { + if (componentName != null && !isValidPackageComponent(manager, componentName)) { Log.d(TAG, "Invalid package found in getShortcutInfo: " + componentName); return null; } else { |