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

Commit 453dd50e authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 6307 into donut 

* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.
parents 8d07c068 52ae0652

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ public class TextToSpeech { 
            }

            }

        };

        };





        Intent intent = new Intent("android.intent.action.USE_TTS");

        Intent intent = new Intent("android.intent.action.START_TTS_SERVICE");

        intent.addCategory("android.intent.category.TTS");

        intent.addCategory("android.intent.category.TTS");

        mContext.bindService(intent, mServiceConnection,

        mContext.bindService(intent, mServiceConnection,

                Context.BIND_AUTO_CREATE);

                Context.BIND_AUTO_CREATE);

packages/TtsService/AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
                 android:name=".TtsService"

                 android:name=".TtsService"

                 android:label="TTS Service">

                 android:label="TTS Service">

            <intent-filter>

            <intent-filter>

                <action android:name="android.intent.action.USE_TTS"/>

                <action android:name="android.intent.action.START_TTS_SERVICE"/>

                <category android:name="android.intent.category.TTS"/>

                <category android:name="android.intent.category.TTS"/>

            </intent-filter>

            </intent-filter>

        </service>

        </service>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -102,7 +102,7 @@ public class TtsService extends Service implements OnCompletionListener { 
    private static final int MAX_SPEECH_ITEM_CHAR_LENGTH = 4000;

    private static final int MAX_SPEECH_ITEM_CHAR_LENGTH = 4000;

    private static final int MAX_FILENAME_LENGTH = 250;

    private static final int MAX_FILENAME_LENGTH = 250;





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

    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";