am 755cb302: Merge "Fix for 2579445 - Using the correct strings for accessing Intent extras now." into froyo

Merge commit '755cb302e90b06820b313c09abfdf35ab899132c' into kraken

* commit '755cb302e90b06820b313c09abfdf35ab899132c':
  Fix for  2579445 - Using the correct strings for accessing Intent extras now.
This commit is contained in:
Charles Chen
2010-04-08 09:52:18 -07:00
committed by Android Git Automerger

View File

@@ -368,11 +368,10 @@ public class TextToSpeechSettings extends PreferenceActivity implements
updateWidgetState();
return;
}
// TODO (clchen): Add these extras to TextToSpeech.Engine
ArrayList<String> available =
data.getStringArrayListExtra("TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES");
data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
ArrayList<String> unavailable =
data.getStringArrayListExtra("TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES");
data.getStringArrayListExtra(TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
if ((available == null) || (unavailable == null)){
// The CHECK_TTS_DATA activity for the plugin did not run properly;
// disable the preview and install controls and return.