From 2ebac69419c5ae9b439178424482ae5ffd3a7e0c Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Sat, 8 Jan 2011 13:58:29 -0800
Subject: [PATCH] Fix bug 3334437 - require an adapter to measure dropdown
 content width

Change-Id: I357a2db66db121816091921e47708140958ad507
---
 core/java/android/widget/Spinner.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 5a08442d84890..e9cfef79d7588 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -672,6 +672,10 @@ public class Spinner extends AbsSpinner implements OnClickListener {
         @Override
         public int measureContentWidth() {
             final SpinnerAdapter adapter = getAdapter();
+            if (adapter == null) {
+                return 0;
+            }
+
             int width = 0;
             View itemView = null;
             int itemType = 0;