diff options
| author | Winson Chung <winsonc@google.com> | 2013-09-04 23:46:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 23:46:14 +0000 |
| commit | 761c89d9ac5d103d826b57c05c629ca6addc51d8 (patch) | |
| tree | 4d0b2dc8644e84786daccdc3a480f8422be12df9 /src | |
| parent | 60e01b610a3247c87384e403697aa332d0d3a1f5 (diff) | |
| parent | 68fd3c33daf7a6d4de287f8691306a55fa54706c (diff) | |
| download | android_packages_apps_Trebuchet-761c89d9ac5d103d826b57c05c629ca6addc51d8.tar.gz android_packages_apps_Trebuchet-761c89d9ac5d103d826b57c05c629ca6addc51d8.tar.bz2 android_packages_apps_Trebuchet-761c89d9ac5d103d826b57c05c629ca6addc51d8.zip | |
Merge "Fixing issue where shortcuts to standard android intents were getting pruned." into jb-ub-gel-agar
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 fc3925a4f..0ebeec32d 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 { |