am fd99e777: Merge "Fix NPE that occurs with poorly behaved widgets" into ics-mr1

* commit 'fd99e7776af59d9f2b4ca6ce75dda0a546b58a36': Fix NPE that occurs with poorly behaved widgets
2011-11-11 13:51:35 -08:00
parent f3da56855b fd99e7776a
commit 0e444be63f
1 changed files with 8 additions and 1 deletions
@@ -460,7 +460,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));