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

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

Browse Source 
* commit 'bb241c3cdedb96d2a3a61e913102d6186f12103a':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
This commit is contained in:
Alan Viverette
2014-12-03 07:56:12 +00:00
committed by Android Git Automerger
parent e43bab74bc bb241c3cde
commit 4483f4611e
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. // This is very efficient since the properties are cached.
final boolean speakPassword = Settings.Secure.getIntForUser( final boolean speakPassword = Settings.Secure.getIntForUser(
mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, 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 // Add text only if password announcement is enabled or if headset is
// used to avoid leaking passwords. // used to avoid leaking passwords.
if (speakPassword || mAudioManager.isBluetoothA2dpOn() if (speakPassword || mAudioManager.isBluetoothA2dpOn()

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

@@ -8393,7 +8393,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
*/ */
private boolean shouldSpeakPasswordsForAccessibility() { private boolean shouldSpeakPasswordsForAccessibility() {
return (Settings.Secure.getIntForUser(mContext.getContentResolver(), 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 @Override