From c5d4e068f2a0c47dc69b72200f8a9fc4bd5a2c28 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Fri, 16 Jun 2017 13:24:32 -0700
Subject: [PATCH] Trim text from autofillvalue when checking for empty.

Test: VirtualContainerActivityTest#testSaveDialogNotShownWhenBackIsPressed
Fixes: 62667931

Change-Id: I7e673eedd39fff7af89c694d0bfc5a495f14ea26
---
 core/java/android/view/autofill/AutofillValue.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
     }
 
     /////////////////////////////////////