Merge "Don't set auto-fill options when Spinner has no adapter."
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 50c016b..1eff26e 100644
--- a/core/java/android/widget/Spinner.java
+++ b/core/java/android/widget/Spinner.java
@@ -921,6 +921,9 @@
@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.