Don't change the voice interactor setting if it's explicitly unset.
Test: manual
Test: atest CtsAssistTestCases CtsVoiceInteractionTestCases CtsVoiceSettingsTestCases
Fix: 167261484
Change-Id: Ibc2c1675f8b026f2915c3faf55e8ff3c52e1ee32
Merged-In: Ibc2c1675f8b026f2915c3faf55e8ff3c52e1ee32
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 9621f68..0abab08 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 @@
+ 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 @@
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) {
