Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb241c3c authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

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

* commit '4eb2e04f':
  Use CURRENT_OR_SELF when checking SPEAK_PASSWORD setting
parents 29f89da0 4eb2e04f

core/java/android/inputmethodservice/KeyboardView.java

+1 −1
Original line number Diff line number Diff line
@@ -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()

core/java/android/widget/TextView.java

+2 −1
Original line number Diff line number Diff line
@@ -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