summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2017-03-04 10:10:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-03-04 10:10:58 +0000
commit5a4e12e14374f2b293fc43fb34b047cc48dca915 (patch)
tree4e8c61c87837a8ddac308f467511b3b92034069e
parentf4537dcf3b878697bace37cc6ad40bd2a5f85f64 (diff)
parent5591044864af38902d77106bbcc88205dcb4eff7 (diff)
Merge "Don't set auto-fill options when Spinner has no adapter."
-rw-r--r--core/java/android/widget/Spinner.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java
index 50c016bb4c3a..1eff26e33609 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.