Android 8.0 更换TTS为Google TTS , TTS播报出来是女声，更改为男生

diff --git a/frameworks/base/core/java/android/speech/tts/TextToSpeech.java b/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
index 763ea2ca38…2ec9f737b0 100755
— a/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
+++ b/frameworks/base/core/java/android/speech/tts/TextToSpeech.java
@@ -244,7 +244,7 @@ public class TextToSpeech {
* Default pitch.
* @hide
*/

•    public static final int DEFAULT_PITCH = 100;
  

•    public static final int DEFAULT_PITCH = 1;
  
     /**
      * Default volume.
  

diff --git a/vendor/dw/apps/GoogleTts/Android.mk b/vendor/dw/apps/GoogleTts/Android.mk
new file mode 100755
index 0000000000…b54f58f6db
— /dev/null
+++ b/vendor/dw/apps/GoogleTts/Android.mk
@@ -0,0 +1,20 @@
+###############################################################################
+# GoogleTTS
+LOCAL_PATH := $(call my-dir)
+
+my_archs := arm x86 arm64 x86_64
+my_src_arch := $(call get-prebuilt-src-arch, $(my_archs))
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := GoogleTTS
+LOCAL_MODULE_CLASS := APPS
+LOCAL_MODULE_TAGS := optional
+LOCAL_BUILT_MODULE_STEM := package.apk
+LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
+#LOCAL_PRIVILEGED_MODULE :=
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_OVERRIDES_PACKAGES := PicoTts
+LOCAL_SRC_FILES := KaTeX parse error: Expected group after '_' at position 15: (LOCAL_MODULE)_̲(my_src_arch).apk
+#LOCAL_REQUIRED_MODULES :=
+LOCAL_MODULE_TARGET_ARCH := $(my_src_arch)
+include $(BUILD_PREBUILT)
diff --git a/vendor/dw/apps/GoogleTts/GoogleTTS_arm.apk b/vendor/dw/apps/GoogleTts/GoogleTTS_arm.apk
new file mode 100755
index 0000000000…bbb790cf78
Binary files /dev/null and b/vendor/dw/apps/GoogleTts/GoogleTTS_arm.apk differ
diff --git a/vendor/dw/apps/GoogleTts/GoogleTTS_arm64.apk b/vendor/dw/apps/GoogleTts/GoogleTTS_arm64.apk
new file mode 100755
index 0000000000…8fb06e5c08
Binary files /dev/null and b/vendor/dw/apps/GoogleTts/GoogleTTS_arm64.apk differ
diff --git a/vendor/dw/apps/GoogleTts/GoogleTTS_x86.apk b/vendor/dw/apps/GoogleTts/GoogleTTS_x86.apk
new file mode 100755
index 0000000000…9b3ef67b7e
Binary files /dev/null and b/vendor/dw/apps/GoogleTts/GoogleTTS_x86.apk differ
diff --git a/vendor/dw/apps/GoogleTts/GoogleTTS_x86_64.apk b/vendor/dw/apps/GoogleTts/GoogleTTS_x86_64.apk
new file mode 100755
index 0000000000…1a2cb8988e
Binary files /dev/null and b/vendor/dw/apps/GoogleTts/GoogleTTS_x86_64.apk differ
diff --git a/vendor/dw/products/dw.mk b/vendor/dw/products/dw.mk
index e5bcc9dafa…558a69d344 100755
— a/vendor/dw/products/dw.mk
+++ b/vendor/dw/products/dw.mk
@@ -1,8 +1,11 @@
PRODUCT_PACKAGES +=
SogouInput_11.21_android_swap \

• Iflytek \
• GPS_Factory_Text

• GPS_Factory_Text ^M
• GoogleTTS ^M
• FleetClient58^M
• #Iflytek ^M

  SpeechService3.0 \

  GPS_Test \

  Lisheng \

•   # ^M
  

diff --git a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/tts/TextToSpeechSettings.java b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/tts/TextToSpeechSettings.java
index e8823a6388…7176fcadc1 100755
— a/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/vendor/mediatek/proprietary/packages/apps/MtkSettings/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -228,7 +228,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
// Do set pitch correctly after it may have changed, and unlike speed, it doesn’t change
// immediately.
final ContentResolver resolver = getContentResolver();

•        mTts.setPitch(android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH)/100.0f);
  

•        //mTts.setPitch(android.provider.Settings.Secure.getInt(resolver, TTS_DEFAULT_PITCH, TextToSpeech.Engine.DEFAULT_PITCH)/100.0f);
  

•                   mTts.setPitch(0.5f);
     }
  
     Locale ttsDefaultLocale = mTts.getDefaultLanguage();
  

@@ -301,7 +302,9 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
if (mTts != null) {
mCurrentEngine = mTts.getCurrentEngine();
mTts.setSpeechRate(mDefaultRate / 100.0f);

•        mTts.setPitch(mDefaultPitch / 100.0f);
  

•        //mTts.setPitch(mDefaultPitch / 100.0f);
  

•                   mTts.setPitch(0.5f);
  

•    }
  
     SettingsActivity activity = null;
  

@@ -705,7 +708,8 @@ public class TextToSpeechSettings extends SettingsPreferenceFragment
android.provider.Settings.Secure.putInt(
getContentResolver(), TTS_DEFAULT_PITCH, mDefaultPitch);
if (mTts != null) {

•            mTts.setPitch(mDefaultPitch / 100.0f);
  

•            //mTts.setPitch(mDefaultPitch / 100.0f);
  

•                           mTts.setPitch(0.5f);
         }
         if (DBG) Log.d(TAG, "TTS default pitch changed, now" + mDefaultPitch);
     } catch (NumberFormatException e) {
  

diff --git a/vendor/partner_gms/apps/GoogleTTS/Android.mk b/vendor/partner_gms/apps/GoogleTTS/Android.mk_disable
similarity index 100%
rename from vendor/partner_gms/apps/GoogleTTS/Android.mk
rename to vendor/partner_gms/apps/GoogleTTS/Android.mk_disable