am d6e36463: Merge change Ib5077943 into eclair-mr2

Merge commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f' into eclair-mr2-plus-aosp

* commit 'd6e36463eabbff9412a24fcff5f5e2c3682c989f':
  Fix NPE when APPWIDGET_PICK has no value for EXTRA_CUSTOM_INFO
This commit is contained in:
Bjorn Bringert
2009-12-09 23:26:38 -08:00
committed by Android Git Automerger

View File

@@ -167,6 +167,7 @@ public class AppWidgetPickActivity extends ActivityPicker {
*/ */
void putAppWidgetItems(List<AppWidgetProviderInfo> appWidgets, void putAppWidgetItems(List<AppWidgetProviderInfo> appWidgets,
List<Bundle> customExtras, List<PickAdapter.Item> items) { List<Bundle> customExtras, List<PickAdapter.Item> items) {
if (appWidgets == null) return;
final int size = appWidgets.size(); final int size = appWidgets.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
AppWidgetProviderInfo info = appWidgets.get(i); AppWidgetProviderInfo info = appWidgets.get(i);