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

Commit 8a45126a authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev

parents ee222182 b6e0cb97

core/java/android/inputmethodservice/KeyboardView.java

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.inputmethodservice.Keyboard.Key; 
import android.media.AudioManager;

import android.os.Handler;

import android.os.Message;

import android.os.UserHandle;

import android.provider.Settings;

import android.util.AttributeSet;

import android.util.TypedValue;
@@ -980,8 +981,9 @@ public class KeyboardView extends View implements View.OnClickListener { 
            onInitializeAccessibilityEvent(event);

            String text = null;

            // This is very efficient since the properties are cached.

            final boolean speakPassword = Settings.Secure.getInt(mContext.getContentResolver(),

                    Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0;

            final boolean speakPassword = Settings.Secure.getIntForUser(

                    mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0,

                    UserHandle.USER_CURRENT) != 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/os/UserHandle.java

+2 −2
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ public final class UserHandle implements Parcelable { 


    /** @hide A user id to indicate that we would like to send to the current

     *  user, but if this is calling from a user process then we will send it

     *  to the caller's user instead of failing wiht a security exception */

     *  to the caller's user instead of failing with a security exception */

    public static final int USER_CURRENT_OR_SELF = -3;



    /** @hide A user handle to indicate that we would like to send to the current

     *  user, but if this is calling from a user process then we will send it

     *  to the caller's user instead of failing wiht a security exception */

     *  to the caller's user instead of failing with a security exception */

    public static final UserHandle CURRENT_OR_SELF = new UserHandle(USER_CURRENT_OR_SELF);



    /** @hide An undefined user id */

core/java/android/widget/TextView.java

+3 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Bundle; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.SystemClock;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.BoringLayout;

import android.text.DynamicLayout;
@@ -8390,8 +8391,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
     * to speak passwords.

     */

    private boolean shouldSpeakPasswordsForAccessibility() {

        return (Settings.Secure.getInt(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) == 1);

        return (Settings.Secure.getIntForUser(mContext.getContentResolver(),

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, UserHandle.USER_CURRENT) == 1);

    }



    @Override

packages/Keyguard/src/com/android/keyguard/ObscureSpeechDelegate.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.keyguard; 
import android.content.ContentResolver;

import android.content.Context;

import android.media.AudioManager;

import android.os.UserHandle;

import android.provider.Settings;

import android.view.View;

import android.view.View.AccessibilityDelegate;
@@ -85,8 +86,8 @@ class ObscureSpeechDelegate extends AccessibilityDelegate { 
    @SuppressWarnings("deprecation")

    private boolean shouldObscureSpeech() {

        // The user can optionally force speaking passwords.

        if (Settings.Secure.getInt(mContentResolver,

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0) != 0) {

        if (Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, 0, UserHandle.USER_CURRENT) != 0) {

            return false;

        }