From 9752428dc1829450e90417ca3e46d077e915ae90 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Tue, 2 Dec 2014 16:24:24 -0800 Subject: [PATCH] Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting Using CURRENT isn't always safe. BUG: 18557273 Change-Id: I12e197ab25b8ffdc04c5e74836945177870698a2 --- core/java/android/inputmethodservice/KeyboardView.java | 2 +- core/java/android/widget/TextView.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java index 3175345175332..b777e8c6f389e 100644 --- a/core/java/android/inputmethodservice/KeyboardView.java +++ b/core/java/android/inputmethodservice/KeyboardView.java @@ -983,7 +983,7 @@ public class KeyboardView extends View implements View.OnClickListener { // This is very efficient since the properties are cached. final boolean speakPassword = Settings.Secure.getIntForUser( mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, - UserHandle.USER_CURRENT) != 0; + UserHandle.USER_CURRENT_OR_SELF) != 0; // Add text only if password announcement is enabled or if headset is // used to avoid leaking passwords. if (speakPassword || mAudioManager.isBluetoothA2dpOn() diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 139354a8afd72..34b3a7290d0b2 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8392,7 +8392,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener */ private boolean shouldSpeakPasswordsForAccessibility() { return (Settings.Secure.getIntForUser(mContext.getContentResolver(), - Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, UserHandle.USER_CURRENT) == 1); + Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, + UserHandle.USER_CURRENT_OR_SELF) == 1); } @Override