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

Merge "Allow listeners to be set before the service connects."

Browse Source
This commit is contained in:
Narayan Kamath
2011-10-05 06:52:24 -07:00
committed by Android (Google) Code Review
parent ea54b17038 a57f23837a
commit b4e7d4ca75
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,6 +440,9 @@ public class TextToSpeech {
private final Context mContext; private final Context mContext;
private Connection mServiceConnection; private Connection mServiceConnection;
private OnInitListener mInitListener; private OnInitListener mInitListener;
// Written from an unspecified application thread, read from
// a binder thread.
private volatile OnUtteranceCompletedListener mUtteranceCompletedListener;
private final Object mStartLock = new Object(); private final Object mStartLock = new Object();
private String mRequestedEngine; private String mRequestedEngine;
@@ -1071,20 +1074,8 @@ public class TextToSpeech {
* @return {@link #ERROR} or {@link #SUCCESS}. * @return {@link #ERROR} or {@link #SUCCESS}.
*/ */
public int setOnUtteranceCompletedListener(final OnUtteranceCompletedListener listener) { public int setOnUtteranceCompletedListener(final OnUtteranceCompletedListener listener) {
return runAction(new Action<Integer>() { mUtteranceCompletedListener = listener;
@Override return TextToSpeech.SUCCESS;
public Integer run(ITextToSpeechService service) throws RemoteException {
ITextToSpeechCallback.Stub callback = new ITextToSpeechCallback.Stub() {
public void utteranceCompleted(String utteranceId) {
if (listener != null) {
listener.onUtteranceCompleted(utteranceId);
}
}
};
service.setCallback(getPackageName(), callback);
return SUCCESS;
}
}, ERROR, "setOnUtteranceCompletedListener");
} }
/** /**
@@ -1137,6 +1128,15 @@ public class TextToSpeech {
private class Connection implements ServiceConnection { private class Connection implements ServiceConnection {
private ITextToSpeechService mService; private ITextToSpeechService mService;
private final ITextToSpeechCallback.Stub mCallback = new ITextToSpeechCallback.Stub() {
@Override
public void utteranceCompleted(String utteranceId) {
OnUtteranceCompletedListener listener = mUtteranceCompletedListener;
if (listener != null) {
listener.onUtteranceCompleted(utteranceId);
}
}
};
public void onServiceConnected(ComponentName name, IBinder service) { public void onServiceConnected(ComponentName name, IBinder service) {
Log.i(TAG, "Connected to " + name); Log.i(TAG, "Connected to " + name);
@@ -1147,7 +1147,13 @@ public class TextToSpeech {
} }
mServiceConnection = this; mServiceConnection = this;
mService = ITextToSpeechService.Stub.asInterface(service); mService = ITextToSpeechService.Stub.asInterface(service);
dispatchOnInit(SUCCESS); try {
mService.setCallback(getPackageName(), mCallback);
dispatchOnInit(SUCCESS);
} catch (RemoteException re) {
Log.e(TAG, "Error connecting to service, setCallback() failed");
dispatchOnInit(ERROR);
}
} }
} }