From 5591044864af38902d77106bbcc88205dcb4eff7 Mon Sep 17 00:00:00 2001 From: Felipe Leme Date: Sat, 4 Mar 2017 00:17:59 -0800 Subject: [PATCH] Don't set auto-fill options when Spinner has no adapter. Change-Id: Ib42fe5ba57d5ef31a00b39945ac3bcacbb217cc8 Fixes: 35965642 Bug: 33550221 Test: compilation only --- core/java/android/widget/Spinner.java | 3 +++ 1 file changed, 3 insertions(+) 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.