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

Commit dd5b4e21 authored by Charles Chen's avatar Charles Chen
Browse files

Added a check to TtsService to make sure that the engine is enabled 

before using it; if the engine is not enabled, TtsService will fall
back to using the default system engine.

Change-Id: I401f9c19cc1351c0ae6daf2b11069e5036febc51
parent a378de74

packages/TtsService/src/android/tts/TtsService.java

+22 −2
Original line number Original line Diff line number Diff line
@@ -122,7 +122,8 @@ public class TtsService extends Service implements OnCompletionListener { 
    private static final int MAX_FILENAME_LENGTH = 250;

    private static final int MAX_FILENAME_LENGTH = 250;

    // TODO use the TTS stream type when available

    // TODO use the TTS stream type when available

    private static final int DEFAULT_STREAM_TYPE = AudioManager.STREAM_MUSIC;

    private static final int DEFAULT_STREAM_TYPE = AudioManager.STREAM_MUSIC;



    // TODO use TextToSpeech.DEFAULT_SYNTH once it is unhidden

    private static final String DEFAULT_SYNTH = "com.svox.pico";

    private static final String ACTION = "android.intent.action.START_TTS_SERVICE";

    private static final String ACTION = "android.intent.action.START_TTS_SERVICE";

    private static final String CATEGORY = "android.intent.category.TTS";

    private static final String CATEGORY = "android.intent.category.TTS";

    private static final String PKGNAME = "android.tts";

    private static final String PKGNAME = "android.tts";
@@ -210,10 +211,29 @@ public class TtsService extends Service implements OnCompletionListener { 
        if (isDefaultEnforced()) {

        if (isDefaultEnforced()) {

            enginePackageName = getDefaultEngine();

            enginePackageName = getDefaultEngine();

        }

        }



        // Make sure that the engine has been allowed by the user

        if (!enginePackageName.equals(DEFAULT_SYNTH)) {

            String[] enabledEngines = android.provider.Settings.Secure.getString(mResolver,

                    android.provider.Settings.Secure.TTS_ENABLED_PLUGINS).split(" ");

            boolean isEnabled = false;

            for (int i=0; i<enabledEngines.length; i++) {

                if (enabledEngines[i].equals(enginePackageName)) {

                    isEnabled = true;

                    break;

                }

            }

            if (!isEnabled) {

                // Do not use an engine that the user has not enabled; fall back

                // to using the default synthesizer.

                enginePackageName = DEFAULT_SYNTH;

            }

        }



        // The SVOX TTS is an exception to how the TTS packaging scheme works

        // The SVOX TTS is an exception to how the TTS packaging scheme works

        // because it is part of the system and not a 3rd party add-on; thus

        // because it is part of the system and not a 3rd party add-on; thus

        // its binary is actually located under /system/lib/

        // its binary is actually located under /system/lib/

        if (enginePackageName.equals("com.svox.pico")) {

        if (enginePackageName.equals(DEFAULT_SYNTH)) {

            soFilename = "/system/lib/libttspico.so";

            soFilename = "/system/lib/libttspico.so";

        } else {

        } else {

            // Find the package

            // Find the package