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;