summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorPhilip P. Moltmann <moltmann@google.com>2017-03-14 21:59:34 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-03-14 21:59:39 +0000
commit9b31b4eac838238ef3013cbfb1379cddbafa0f12 (patch)
treeac949179dea06f0c4c8f8e45df8fa43ce67b9040 /core/java/android/widget/TextView.java
parentd5f0bc3676204851fd42b80406718fa666624332 (diff)
parent9668903731c272e51ce610598c052ef411c9d89f (diff)
Merge "Make it clear which type of AutoFillValue is set"
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 90781b428917..d04f70febabb 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10014,10 +10014,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
@Override
public void autofill(AutofillValue value) {
- final CharSequence text = value.getTextValue();
-
- if (text != null && isTextEditable()) {
- setText(text, mBufferType, true, 0);
+ if (value.isText()) {
+ if (isTextEditable()) {
+ setText(value.getTextValue(), mBufferType, true, 0);
+ }
+ } else {
+ Log.w(LOG_TAG, value + " could not be autofilled into " + this);
}
}