Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5df5dde authored Feb 12, 2015 by Dianne Hackborn

Fix voice settings to not be broken. :(

It was setting the wrong recognizer activity, so when you
changed the voice interactor it would break the recognizer but
at least it would reset to the default interactor at boot and
not still be broken. :p

Change-Id: Icfec4f11526528b821e5fd67a6519bf5874ea133

parent 3dd090d9

src/com/android/settings/voice/VoiceInputHelper.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -136,11 +136,9 @@ public final class VoiceInputHelper {
		continue;
		}
		mAvailableInteractionInfos.add(new InteractionInfo(mContext.getPackageManager(), info));
		if (info.getRecognitionService() != null) {
		interactorRecognizers.add(new ComponentName(resolveInfo.serviceInfo.packageName,
		info.getRecognitionService()));
		}
		}
		Collections.sort(mAvailableInteractionInfos);

		// Get the currently selected recognizer from the secure setting.

src/com/android/settings/voice/VoiceInputSettings.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -146,12 +146,11 @@ public class VoiceInputSettings extends SettingsPreferenceFragment implements
		// Put the new value back into secure settings.
		Settings.Secure.putString(getActivity().getContentResolver(),
		Settings.Secure.VOICE_INTERACTION_SERVICE, key);
		// Eventually we will require that an interactor always specify a recognizer
		if (info.settings != null) {
		Settings.Secure.putString(getActivity().getContentResolver(),
		Settings.Secure.VOICE_RECOGNITION_SERVICE,
		info.settings.flattenToShortString());
		}
		new ComponentName(info.service.packageName,
		info.serviceInfo.getRecognitionService())
		.flattenToShortString());
		return;
		}
		}