Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4eb2e04f: Merge "Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting" into lmp-mr1-dev

Browse Source 
* commit '4eb2e04f4d3eafdf56840a0988dd730dc433478d':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
This commit is contained in:
Alan Viverette
2014-12-03 02:18:12 +00:00
committed by Android Git Automerger
parent 29f89da0a8 4eb2e04f4d
commit bb241c3cde
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/inputmethodservice/KeyboardView.java
View File

@@ -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()

3
core/java/android/widget/TextView.java
View File

@@ -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