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

VIMS: Don't set recognizer when assistant changes.

Browse Source 
Decoupling recognizer from assistant allows it to be provided by a
different package.
The recognizer is now set only on initializing the user or when
packages are modified.

There should be no change to how the assistant or interactor is set.

Bug: 167597525
Test: manual - set/unset assistant, reboot.
Test: atest CtsVoiceInteractionTestCases
Change-Id: I42bd1ab768070d444a1f6e3e78571cae8288a8ba
This commit is contained in:
Ahaan Ugale
2021-02-08 21:31:15 -08:00
parent 6ab4236761
commit 1537ad4281
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

@@ -1599,20 +1599,6 @@ public class VoiceInteractionManagerService extends SystemService {
}
}
private @NonNull String getDefaultRecognizer(@NonNull UserHandle user) {
ResolveInfo resolveInfo = mPm.resolveServiceAsUser(
new Intent(RecognitionService.SERVICE_INTERFACE),
PackageManager.GET_META_DATA, user.getIdentifier());
if (resolveInfo == null || resolveInfo.serviceInfo == null) {
Log.w(TAG, "Unable to resolve default voice recognition service.");
return "";
}
return new ComponentName(resolveInfo.serviceInfo.packageName,
resolveInfo.serviceInfo.name).flattenToShortString();
}
/**
* Convert the assistant-role holder into settings. The rest of the system uses the
* settings.
@@ -1634,9 +1620,6 @@ public class VoiceInteractionManagerService extends SystemService {
Settings.Secure.ASSISTANT, "", userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_INTERACTION_SERVICE, "", userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_RECOGNITION_SERVICE, getDefaultRecognizer(user),
userId);
} else {
// Assistant is singleton role
String pkg = roleHolders.get(0);
@@ -1663,9 +1646,6 @@ public class VoiceInteractionManagerService extends SystemService {
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_INTERACTION_SERVICE, serviceComponentName,
userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_RECOGNITION_SERVICE, serviceRecognizerName,
userId);
return;
}
@@ -1685,9 +1665,6 @@ public class VoiceInteractionManagerService extends SystemService {
activityInfo.getComponentName().flattenToShortString(), userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_INTERACTION_SERVICE, "", userId);
Settings.Secure.putStringForUser(getContext().getContentResolver(),
Settings.Secure.VOICE_RECOGNITION_SERVICE,
getDefaultRecognizer(user), userId);
return;
}
}