diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 50c016bb4c3a0..1eff26e33609b 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -921,6 +921,9 @@ public class Spinner extends AbsSpinner implements OnClickListener { @Override public void onProvideAutoFillStructure(ViewStructure structure, int flags) { super.onProvideAutoFillStructure(structure, flags); + + if (getAdapter() == null) return; + // TODO(b/33197203): implement sanitization so initial value is only sanitized when coming // from resources.