summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2017-06-16 23:56:12 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-16 23:56:12 +0000
commit5ae4e8dc9d7c160082f97c37ff0cea36a60fdff4 (patch)
tree9b10b6b692e00c6d53b45641a71eeeab8992f512
parent09c2b2345b420381f72656ec2f12f016db3b041d (diff)
parent9ccb3a86aee01d8e6c3aee182784750cc3b5390c (diff)
Merge "Trim text from autofillvalue when checking for empty." into oc-dev am: b3b13ff62c am: 1c03d3fcef
am: 9ccb3a86ae Change-Id: I5a6101d80376a0fd60bd6c49fe6a12f8ec9df12e
-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;
}
/////////////////////////////////////