From b0cde2cabaab13bdc20dbbf1806b96760e666e5c Mon Sep 17 00:00:00 2001 From: Sergio Sancho Date: Thu, 26 Jan 2017 20:39:05 +0000 Subject: [PATCH] Ensure default pitch is used when none is specified. Test: Manual Change-Id: I09ab4ccea439d01c65a06c3c44b4ff210ddf7f54 --- core/java/android/speech/tts/TextToSpeechService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/java/android/speech/tts/TextToSpeechService.java b/core/java/android/speech/tts/TextToSpeechService.java index 55da52b028d7a..a6ab1496001d0 100644 --- a/core/java/android/speech/tts/TextToSpeechService.java +++ b/core/java/android/speech/tts/TextToSpeechService.java @@ -409,6 +409,10 @@ public abstract class TextToSpeechService extends Service { return getSecureSettingInt(Settings.Secure.TTS_DEFAULT_RATE, Engine.DEFAULT_RATE); } + private int getDefaultPitch() { + return getSecureSettingInt(Settings.Secure.TTS_DEFAULT_PITCH, Engine.DEFAULT_PITCH); + } + private String[] getSettingsLocale() { final Locale locale = mEngineHelper.getLocalePrefForEngine(mPackageName); return TtsEngines.toOldLocaleStringFormat(locale); @@ -925,7 +929,7 @@ public abstract class TextToSpeechService extends Service { } int getPitch() { - return getIntParam(mParams, Engine.KEY_PARAM_PITCH, Engine.DEFAULT_PITCH); + return getIntParam(mParams, Engine.KEY_PARAM_PITCH, getDefaultPitch()); } @Override