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

Merge "Don't change the voice interactor setting if it's explicitly unset." into rvc-qpr-dev

Browse Source
This commit is contained in:
Ahaan Ugale
2020-12-18 07:20:42 +00:00
committed by Android (Google) Code Review
parent 8928131772 1c475a4b43
commit 8b6f7f10f0
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,8 +395,9 @@ public class VoiceInteractionManagerService extends SystemService {
+ interactorInfo + ")");
}
// Initializing settings, look for an interactor first (but only on non-svelte).
if (curInteractorInfo == null && mEnableService) {
// Initializing settings. Look for an interactor first, but only on non-svelte and only
// if the user hasn't explicitly unset it.
if (curInteractorInfo == null && mEnableService && !"".equals(curInteractorStr)) {
curInteractorInfo = findAvailInteractor(userHandle, null);
}
@@ -1692,8 +1693,13 @@ public class VoiceInteractionManagerService extends SystemService {
if (isPackageAppearing(pkgName) != PACKAGE_UNCHANGED) {
return;
}
final String curInteractorStr = Settings.Secure.getStringForUser(
mContext.getContentResolver(),
Settings.Secure.VOICE_INTERACTION_SERVICE, mCurUser);
final ComponentName curInteractor = getCurInteractor(mCurUser);
if (curInteractor == null) {
// If there's no interactor and the user hasn't explicitly unset it, check if the
// modified package offers one.
if (curInteractor == null && !"".equals(curInteractorStr)) {
final VoiceInteractionServiceInfo availInteractorInfo
= findAvailInteractor(mCurUser, pkgName);
if (availInteractorInfo != null) {