diff options
| author | Alan Viverette <alanv@google.com> | 2014-11-24 15:13:43 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2014-11-25 16:08:03 -0800 |
| commit | b6e0cb97b7d8e4acf345efc8066f1587408b83e0 (patch) | |
| tree | 78ce9dcd15223996bea11d7e91cb7bc984712444 /core/java/android/inputmethodservice | |
| parent | 59093d925decaf6ddf2e952de25e3cdd1b492d81 (diff) | |
| download | frameworks_base-b6e0cb97b7d8e4acf345efc8066f1587408b83e0.zip frameworks_base-b6e0cb97b7d8e4acf345efc8066f1587408b83e0.tar.gz frameworks_base-b6e0cb97b7d8e4acf345efc8066f1587408b83e0.tar.bz2 | |
Load SPEAK_PASSWORD from currently active user rather than self
Also fixes a typo in UserHandle's docs.
BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
Diffstat (limited to 'core/java/android/inputmethodservice')
| -rw-r--r-- | core/java/android/inputmethodservice/KeyboardView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/inputmethodservice/KeyboardView.java b/core/java/android/inputmethodservice/KeyboardView.java index af75a0a..3175345 100644 --- a/core/java/android/inputmethodservice/KeyboardView.java +++ b/core/java/android/inputmethodservice/KeyboardView.java @@ -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() |