diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-11-10 17:02:56 -0800 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2011-11-10 17:15:03 -0800 |
| commit | 85dec65f63fca838a496331c4c6b015acbceacd0 (patch) | |
| tree | 212162faa7a12caa6b0a54961f89bdf9c64749f7 | |
| parent | 929fff0e747f1361db19e62f8a1e462cffc0a7b6 (diff) | |
| download | android_packages_apps_Trebuchet-85dec65f63fca838a496331c4c6b015acbceacd0.tar.gz android_packages_apps_Trebuchet-85dec65f63fca838a496331c4c6b015acbceacd0.tar.bz2 android_packages_apps_Trebuchet-85dec65f63fca838a496331c4c6b015acbceacd0.zip | |
DO NOT MERGE Fix NPE that occurs with poorly behaved widgets
Bug #5587311
Change-Id: Ie81ec8b819a757298f563267824c74ee0fc55087
| -rw-r--r-- | src/com/android/launcher2/AppsCustomizePagedView.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java index 099c1ac11..0d2be17f2 100644 --- a/src/com/android/launcher2/AppsCustomizePagedView.java +++ b/src/com/android/launcher2/AppsCustomizePagedView.java @@ -453,7 +453,14 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen AppWidgetManager.getInstance(mLauncher).getInstalledProviders(); Intent shortcutsIntent = new Intent(Intent.ACTION_CREATE_SHORTCUT); List<ResolveInfo> shortcuts = mPackageManager.queryIntentActivities(shortcutsIntent, 0); - mWidgets.addAll(widgets); + for (AppWidgetProviderInfo widget : widgets) { + if (widget.minWidth > 0 && widget.minHeight > 0) { + mWidgets.add(widget); + } else { + Log.e(LOG_TAG, "Widget " + widget.provider + " has invalid dimensions (" + + widget.minWidth + ", " + widget.minHeight + ")"); + } + } mWidgets.addAll(shortcuts); Collections.sort(mWidgets, new LauncherModel.WidgetAndShortcutNameComparator(mPackageManager)); |