diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e962d151e5..f6629d1f36c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4112,19 +4112,19 @@
a full voice interaction service. This is something that provides interactive
voice control of applications; for example you can tell it commands to have it
launch and let you interact with applications through your voice. -->
- Full voice interaction
+ Full hotword and interaction
- Simple voice recognition
+ Simple speech to text
This voice input service will be able to
- control all voice enabled applications on your behalf.
- It comes from the %s application.
- Enable the use of this service?
+ perform always-on voice monitoring and control voice enabled applications on your
+ behalf. It comes from the %s
+ application. Enable the use of this service?
diff --git a/src/com/android/settings/voice/VoiceInputSettings.java b/src/com/android/settings/voice/VoiceInputSettings.java
index aa8502415c2..262f1458345 100644
--- a/src/com/android/settings/voice/VoiceInputSettings.java
+++ b/src/com/android/settings/voice/VoiceInputSettings.java
@@ -160,7 +160,7 @@ public class VoiceInputSettings extends SettingsPreferenceFragment implements
VoiceInputHelper.RecognizerInfo info = mHelper.mAvailableRecognizerInfos.get(i);
if (info.key.equals(key)) {
Settings.Secure.putString(getActivity().getContentResolver(),
- Settings.Secure.VOICE_INTERACTION_SERVICE, null);
+ Settings.Secure.VOICE_INTERACTION_SERVICE, "");
Settings.Secure.putString(getActivity().getContentResolver(),
Settings.Secure.VOICE_RECOGNITION_SERVICE, key);
return;