summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/widget/ArrayAdapter.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/ArrayAdapter.java b/core/java/android/widget/ArrayAdapter.java
index de9f76d6eea1..30c8d7c167aa 100644
--- a/core/java/android/widget/ArrayAdapter.java
+++ b/core/java/android/widget/ArrayAdapter.java
@@ -448,7 +448,9 @@ public class ArrayAdapter<T> extends BaseAdapter implements Filterable, ThemedSp
}
final T item = getItem(position);
- if (item instanceof CharSequence) {
+ if (item == null) {
+ text.setText("");
+ } else if (item instanceof CharSequence) {
text.setText((CharSequence) item);
} else {
text.setText(item.toString());