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

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

Cherry-picking this fix into Froyo. 

This fix is part of addressing bug #2548048

Making it possible to determine which TTS engine is currently set
as the default by the user.

Change-Id: Ifa422f43a33498b94d96811078c0794d64668357
parent 9c3cee98

core/java/android/speech/tts/ITts.aidl

+3 −1
Original line number Diff line number Diff line
@@ -62,4 +62,6 @@ interface ITts { 
    int playSilence(in String callingApp, in long duration, in int queueMode, in String[] params);



    int setEngineByPackageName(in String enginePackageName);



    String getDefaultEngine();

}

core/java/android/speech/tts/TextToSpeech.java

+39 −0
Original line number Diff line number Diff line
@@ -1340,4 +1340,43 @@ public class TextToSpeech { 
        }

    }





    /**

     * Gets the packagename of the default speech synthesis engine.

     *

     * @return Packagename of the TTS engine that the user has chosen as their default.

     *

     * @hide

     */

    public String getDefaultEngine() {

        synchronized (mStartLock) {

            String engineName = "";

            if (!mStarted) {

                return engineName;

            }

            try {

                engineName = mITts.getDefaultEngine();

            } catch (RemoteException e) {

                // TTS died; restart it.

                Log.e("TextToSpeech.java - setEngineByPackageName", "RemoteException");

                e.printStackTrace();

                mStarted = false;

                initTts();

            } catch (NullPointerException e) {

                // TTS died; restart it.

                Log.e("TextToSpeech.java - setEngineByPackageName", "NullPointerException");

                e.printStackTrace();

                mStarted = false;

                initTts();

            } catch (IllegalStateException e) {

                // TTS died; restart it.

                Log.e("TextToSpeech.java - setEngineByPackageName", "IllegalStateException");

                e.printStackTrace();

                mStarted = false;

                initTts();

            } finally {

                return engineName;

            }

        }

    }

}

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

+9 −0
Original line number Diff line number Diff line
@@ -1436,6 +1436,15 @@ public class TtsService extends Service implements OnCompletionListener { 
            return mSelf.setEngine(packageName);

        }



        /**

         * Returns the packagename of the default speech synthesis engine.

         *

         * @return Packagename of the TTS engine that the user has chosen as their default.

         */

        public String getDefaultEngine() {

            return mSelf.getDefaultEngine();

        }



    };



}