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

Merge "speech: Connect on model check/download trigger"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-10 11:08:45 +00:00
committed by Android (Google) Code Review
parent 0afeb1a476 515bbcf6aa
commit 0c10c25ed7
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,6 +496,17 @@ public class SpeechRecognizer {
Objects.requireNonNull(recognizerIntent, "intent must not be null");
Objects.requireNonNull(supportListener, "listener must not be null");
if (DBG) {
Slog.i(TAG, "#checkRecognitionSupport called");
if (mService == null) {
Slog.i(TAG, "Connection is not established yet");
}
}
if (mService == null) {
// First time connection: first establish a connection, then dispatch.
connectToSystemService();
}
putMessage(Message.obtain(mHandler, MSG_CHECK_RECOGNITION_SUPPORT,
Pair.create(recognizerIntent, supportListener)));
}
@@ -510,7 +521,17 @@ public class SpeechRecognizer {
*/
public void triggerModelDownload(@NonNull Intent recognizerIntent) {
Objects.requireNonNull(recognizerIntent, "intent must not be null");
putMessage(Message.obtain(mHandler, MSG_TRIGGER_MODEL_DOWNLOAD));
if (DBG) {
Slog.i(TAG, "#triggerModelDownload called");
if (mService == null) {
Slog.i(TAG, "Connection is not established yet");
}
}
if (mService == null) {
// First time connection: first establish a connection, then dispatch.
connectToSystemService();
}
putMessage(Message.obtain(mHandler, MSG_TRIGGER_MODEL_DOWNLOAD, recognizerIntent));
}
/**
@@ -625,7 +646,6 @@ public class SpeechRecognizer {
}
try {
mService.triggerModelDownload(recognizerIntent);
if (DBG) Log.d(TAG, "service download support command succeeded");
} catch (final RemoteException e) {
Log.e(TAG, "downloadModel() failed", e);
mListener.onError(ERROR_CLIENT);
@@ -705,6 +725,9 @@ public class SpeechRecognizer {
}
private synchronized boolean maybeInitializeManagerService() {
if (DBG) {
Log.i(TAG, "#maybeInitializeManagerService found = " + mManagerService);
}
if (mManagerService != null) {
return true;
}
@@ -712,8 +735,13 @@ public class SpeechRecognizer {
mManagerService = IRecognitionServiceManager.Stub.asInterface(
ServiceManager.getService(Context.SPEECH_RECOGNITION_SERVICE));
if (mManagerService == null && mListener != null) {
mListener.onError(ERROR_CLIENT);
if (DBG) {
Log.i(TAG, "#maybeInitializeManagerService instantiated =" + mManagerService);
}
if (mManagerService == null) {
if (mListener != null) {
mListener.onError(ERROR_CLIENT);
}
return false;
}
return true;