am 2ebac694: Fix bug 3334437 - require an adapter to measure dropdown content width

* commit '2ebac69419c5ae9b439178424482ae5ffd3a7e0c': Fix bug 3334437 - require an adapter to measure dropdown content width
2011-01-08 14:07:07 -08:00
parent 6de1301b49 2ebac69419
commit ccc837e3d4
1 changed files with 4 additions and 0 deletions
--- 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;