Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6307 into donut

Browse Source 
* changes:
  Fixes a compatibility issue with users that have the old TTS installed already.
This commit is contained in:
Android (Google) Code Review
2009-07-06 16:28:03 -07:00
parent 8d07c06846 52ae06521a
commit 453dd50e70
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/speech/tts/TextToSpeech.java
View File

@@ -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);

2
packages/TtsService/AndroidManifest.xml
View File

@@ -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>

2
packages/TtsService/src/android/tts/TtsService.java
View File

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