Merge "Hiding text from obscured text fields." into oc-dev

am: bcc6cc84bf Change-Id: I06ac2af600c9703d5af9b583b63ff79ab01d6c68
2017-05-11 03:57:37 +00:00
parent 613d0b2beb bcc6cc84bf
commit 4a40d25743
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -11838,7 +11838,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
                        + " before=" + before + " after=" + after + ": " + buffer);
            }

-            if (AccessibilityManager.getInstance(mContext).isEnabled()) {
+            if (AccessibilityManager.getInstance(mContext).isEnabled()
+                    && !isPasswordInputType(getInputType()) && !hasPasswordTransformationMethod()) {
                mBeforeText = buffer.toString();
            }