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

Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo

Browse Source
This commit is contained in:
Bjorn Bringert
2010-04-26 07:52:57 -07:00
committed by Android (Google) Code Review
parent 87782f2bdf 1c3cca0abe
commit cb4c894afa
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
core/java/android/speech/RecognitionService.java
View File

@@ -53,6 +53,9 @@ public abstract class RecognitionService extends Service {
/** Debugging flag */
private static final boolean DBG = false;
/** Binder of the recognition service */
private RecognitionServiceBinder mBinder = new RecognitionServiceBinder(this);
/**
* The current callback of an application that invoked the
* {@link RecognitionService#onStartListening(Intent, Callback)} method
@@ -136,31 +139,6 @@ public abstract class RecognitionService extends Service {
}
}
/** Binder of the recognition service */
private final IRecognitionService.Stub mBinder = new IRecognitionService.Stub() {
public void startListening(Intent recognizerIntent, IRecognitionListener listener) {
if (DBG) Log.d(TAG, "startListening called by:" + listener.asBinder());
if (checkPermissions(listener)) {
mHandler.sendMessage(Message.obtain(mHandler, MSG_START_LISTENING,
new StartListeningArgs(recognizerIntent, listener)));
}
}
public void stopListening(IRecognitionListener listener) {
if (DBG) Log.d(TAG, "stopListening called by:" + listener.asBinder());
if (checkPermissions(listener)) {
mHandler.sendMessage(Message.obtain(mHandler, MSG_STOP_LISTENING, listener));
}
}
public void cancel(IRecognitionListener listener) {
if (DBG) Log.d(TAG, "cancel called by:" + listener.asBinder());
if (checkPermissions(listener)) {
mHandler.sendMessage(Message.obtain(mHandler, MSG_CANCEL, listener));
}
}
};
/**
* Checks whether the caller has sufficient permissions
*
@@ -210,6 +188,14 @@ public abstract class RecognitionService extends Service {
return mBinder;
}
@Override
public void onDestroy() {
if (DBG) Log.d(TAG, "onDestroy");
mCurrentCallback = null;
mBinder.clearReference();
super.onDestroy();
}
/**
* This class receives callbacks from the speech recognition service and forwards them to the
* user. An instance of this class is passed to the
@@ -306,4 +292,42 @@ public abstract class RecognitionService extends Service {
mListener.onRmsChanged(rmsdB);
}
}
/** Binder of the recognition service */
private static class RecognitionServiceBinder extends IRecognitionService.Stub {
private RecognitionService mInternalService;
public RecognitionServiceBinder(RecognitionService service) {
mInternalService = service;
}
public void startListening(Intent recognizerIntent, IRecognitionListener listener) {
if (DBG) Log.d(TAG, "startListening called by:" + listener.asBinder());
if (mInternalService != null && mInternalService.checkPermissions(listener)) {
mInternalService.mHandler.sendMessage(Message.obtain(mInternalService.mHandler,
MSG_START_LISTENING, mInternalService.new StartListeningArgs(
recognizerIntent, listener)));
}
}
public void stopListening(IRecognitionListener listener) {
if (DBG) Log.d(TAG, "stopListening called by:" + listener.asBinder());
if (mInternalService != null && mInternalService.checkPermissions(listener)) {
mInternalService.mHandler.sendMessage(Message.obtain(mInternalService.mHandler,
MSG_STOP_LISTENING, listener));
}
}
public void cancel(IRecognitionListener listener) {
if (DBG) Log.d(TAG, "cancel called by:" + listener.asBinder());
if (mInternalService != null && mInternalService.checkPermissions(listener)) {
mInternalService.mHandler.sendMessage(Message.obtain(mInternalService.mHandler,
MSG_CANCEL, listener));
}
}
public void clearReference() {
mInternalService = null;
}
}
}

1
core/java/android/speech/SpeechRecognizer.java
View File

@@ -382,6 +382,7 @@ public class SpeechRecognizer {
mPendingTasks.clear();
mService = null;
mConnection = null;
mListener.mInternalListener = null;
}
/**