diff --git a/core/java/android/view/autofill/AutofillValue.java b/core/java/android/view/autofill/AutofillValue.java
index 3beae11cf38c0..f0ca0d157f8dc 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;
     }
 
     /////////////////////////////////////