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

Merge "speech: Add lenient SpeechRecognizer instantiation" into sc-dev am: cc204c7e2e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15107812

Change-Id: I94f28b043d3fb6d57f112e96c74ec09da22ec392
This commit is contained in:
Andrea Ambu
2021-07-08 17:55:18 +00:00
committed by Automerger Merge Worker
parent a79482b0f5 cc204c7e2e
commit 5bbe9cfbfc
2 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/test-current.txt
View File

@@ -2403,6 +2403,7 @@ package android.service.watchdog {
package android.speech {
public class SpeechRecognizer {
method @MainThread @NonNull public static android.speech.SpeechRecognizer createOnDeviceTestingSpeechRecognizer(@NonNull android.content.Context);
method @RequiresPermission(android.Manifest.permission.MANAGE_SPEECH_RECOGNITION) public void setTemporaryOnDeviceRecognizer(@Nullable android.content.ComponentName);
}

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

@@ -260,23 +260,7 @@ public class SpeechRecognizer {
ComponentName componentName =
ComponentName.unflattenFromString(
context.getString(R.string.config_defaultOnDeviceSpeechRecognitionService));
if (componentName == null) {
return false;
}
List<ResolveInfo> resolveInfos =
context.getPackageManager().queryIntentServices(
new Intent(RecognitionService.SERVICE_INTERFACE), 0);
if (resolveInfos == null) {
return false;
}
for (ResolveInfo ri : resolveInfos) {
if (ri.serviceInfo != null && componentName.equals(ri.serviceInfo.getComponentName())) {
return true;
}
}
return false;
return componentName != null;
}
/**
@@ -354,20 +338,41 @@ public class SpeechRecognizer {
* notifications will be received.
*
* @param context in which to create {@code SpeechRecognizer}
* @throws UnsupportedOperationException iff {@link #isOnDeviceRecognitionAvailable(Context)}
* is false
* @return a new on-device {@code SpeechRecognizer}.
* @throws UnsupportedOperationException iff {@link #isOnDeviceRecognitionAvailable(Context)}
* is false
*/
@NonNull
@MainThread
public static SpeechRecognizer createOnDeviceSpeechRecognizer(@NonNull final Context context) {
if (!isOnDeviceRecognitionAvailable(context)) {
throw new UnsupportedOperationException("On-device recognition is not available");
}
return lenientlyCreateOnDeviceSpeechRecognizer(context);
}
/**
* Helper method to create on-device SpeechRecognizer in tests even when the device does not
* support on-device speech recognition.
*
* @hide
*/
@TestApi
@NonNull
@MainThread
public static SpeechRecognizer createOnDeviceTestingSpeechRecognizer(
@NonNull final Context context) {
return lenientlyCreateOnDeviceSpeechRecognizer(context);
}
@NonNull
@MainThread
private static SpeechRecognizer lenientlyCreateOnDeviceSpeechRecognizer(
@NonNull final Context context) {
if (context == null) {
throw new IllegalArgumentException("Context cannot be null");
}
checkIsCalledFromMainThread();
if (!isOnDeviceRecognitionAvailable(context)) {
throw new UnsupportedOperationException("On-device recognition is not available");
}
return new SpeechRecognizer(context, /* onDevice */ true);
}