summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2017-06-16 23:06:47 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-16 23:06:47 +0000
commit9ccb3a86aee01d8e6c3aee182784750cc3b5390c (patch)
tree3d2bca6f153e251bed26b8c7a3fac7e6fc92e1fa
parentb5e0a5bec36da7744f61b10db50617569ae885c5 (diff)
parent1c03d3fcefad0b353c50425afdcbed747f6bd3cf (diff)
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c
am: 1c03d3fcef Change-Id: I8f94db3b3b129caca53f3cb0ed0b16b2a4951648
-rw-r--r--core/java/android/view/autofill/AutofillValue.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/view/autofill/AutofillValue.java b/core/java/android/view/autofill/AutofillValue.java
index 3beae11cf38c..f0ca0d157f8d 100644
--- a/core/java/android/view/autofill/AutofillValue.java
+++ b/core/java/android/view/autofill/AutofillValue.java
@@ -141,7 +141,10 @@ public final class AutofillValue implements Parcelable {
* @hide
*/
public boolean isEmpty() {
- return isText() && ((CharSequence) mValue).length() == 0;
+ if (!isText()) return false;
+
+ final CharSequence text = (CharSequence) mValue;
+ return text == null || TextUtils.getTrimmedLength(text) == 0;
}
/////////////////////////////////////