diff options
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 9621f68f9d6c..0abab087b6d8 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -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) { |