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

am fcf671be: Fix EBADF in TTS synthesizeToFile method.

Browse Source 
* commit 'fcf671be890f9fb49067c5f86b182bf8b8e7b9c0':
  Fix EBADF in TTS synthesizeToFile method.
This commit is contained in:
Przemyslaw Szczepaniak
2013-03-06 16:48:20 +00:00
committed by Android Git Automerger
parent 563c374faf fcf671be89
commit e634d787e4
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/android/speech/tts/TextToSpeechService.java
View File

@@ -36,6 +36,7 @@ import android.util.Log;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.Locale;
import java.util.Set;
@@ -656,19 +657,18 @@ public abstract class TextToSpeechService extends Service {
}
}
private class SynthesisToFileSpeechDescriptorItem extends SynthesisSpeechItem {
private final FileDescriptor mFileDescriptor;
private class SynthesisToFileOutputStreamSpeechItem extends SynthesisSpeechItem {
private final FileOutputStream mFileOutputStream;
public SynthesisToFileSpeechDescriptorItem(Object callerIdentity, int callerUid,
int callerPid, Bundle params, String text, FileDescriptor fileDescriptor) {
int callerPid, Bundle params, String text, FileOutputStream fileOutputStream) {
super(callerIdentity, callerUid, callerPid, params, text);
mFileDescriptor = fileDescriptor;
mFileOutputStream = fileOutputStream;
}
@Override
protected AbstractSynthesisCallback createSynthesisCallback() {
FileOutputStream fileOutputStream = new FileOutputStream(mFileDescriptor);
return new FileSynthesisCallback(fileOutputStream.getChannel());
return new FileSynthesisCallback(mFileOutputStream.getChannel());
}
@Override
@@ -680,6 +680,11 @@ public abstract class TextToSpeechService extends Service {
} else {
dispatchOnError();
}
try {
mFileOutputStream.close();
} catch(IOException e) {
Log.w(TAG, "Failed to close output file", e);
}
return status;
}
}
@@ -805,9 +810,9 @@ public abstract class TextToSpeechService extends Service {
return TextToSpeech.ERROR;
}
SpeechItem item = new SynthesisToFileSpeechDescriptorItem(caller, Binder.getCallingUid(),
Binder.getCallingPid(), params, text,
fileDescriptor.getFileDescriptor());
SpeechItem item = new SynthesisToFileOutputStreamSpeechItem(caller,
Binder.getCallingUid(), Binder.getCallingPid(), params, text,
new ParcelFileDescriptor.AutoCloseOutputStream(fileDescriptor));
return mSynthHandler.enqueueSpeechItem(TextToSpeech.QUEUE_ADD, item);
}