From 3a499e013ce1dfa6b90e222e030fab03333fb016 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 19 May 2014 16:04:40 -0700
Subject: [PATCH] Fix password obscuring in TextView accessibility node

BUG: 14998638
Change-Id: I215ea7b11bef5242e6adb1e595df36555548c165
---
 core/java/android/widget/TextView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 8f073deccde19..a4a9680e09954 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -8194,7 +8194,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         final boolean isPassword = hasPasswordTransformationMethod();
         info.setPassword(isPassword);
 
-        if (!isPassword) {
+        if (!isPassword || shouldSpeakPasswordsForAccessibility()) {
             info.setText(getTextForAccessibility());
         }