Add config_forceVoiceInteractionServicePackage to allow a device to config its... (80cf2210) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+3 −2

Original line number	Diff line number	Diff line
		@@ -2100,8 +2100,9 @@
		<!-- Keyguard component -->
		<string name="config_keyguardComponent" translatable="false">com.android.systemui/com.android.systemui.keyguard.KeyguardService</string>

		<!-- This config is used to force VoiceInteractionService to start on certain low ram devices. -->
		<bool name="config_forceEnableVoiceInteractionService">false</bool>
		<!-- This config is used to force VoiceInteractionService to start on certain low ram devices.
		It declares the package name of VoiceInteractionService that should be started. -->
		<string translatable="false" name="config_forceVoiceInteractionServicePackage"></string>

		<!-- This config is ued to determine whether animations are allowed in low power mode. -->
		<bool name="config_allowAnimationsInLowPowerMode">false</bool>

core/res/res/values/symbols.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,6 @@
		<java-symbol type="bool" name="config_enableScreenshotChord" />
		<java-symbol type="bool" name="config_bluetooth_default_profiles" />
		<java-symbol type="bool" name="config_enableWifiDisplay" />
		<java-symbol type="bool" name="config_forceEnableVoiceInteractionService" />
		<java-symbol type="bool" name="config_allowAnimationsInLowPowerMode" />
		<java-symbol type="bool" name="config_useDevInputEventForAudioJack" />
		<java-symbol type="bool" name="config_safe_media_volume_enabled" />
		@@ -553,6 +552,7 @@
		<java-symbol type="string" name="chooseActivity" />
		<java-symbol type="string" name="config_default_dns_server" />
		<java-symbol type="string" name="config_ethernet_iface_regex" />
		<java-symbol type="string" name="config_forceVoiceInteractionServicePackage" />
		<java-symbol type="string" name="config_mms_user_agent" />
		<java-symbol type="string" name="config_mms_user_agent_profile_url" />
		<java-symbol type="string" name="config_ntpServer" />

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

+24 −7

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.content.pm.ServiceInfo;
		import android.content.res.Configuration;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.hardware.soundtrigger.IRecognitionStatusCallback;
		@@ -150,7 +149,7 @@ public class VoiceInteractionManagerService extends SystemService {
		// the user to have the default voice interaction service enabled.
		// Note that we don't do this for low-RAM devices, since we aren't
		// supporting voice interaction services there.
		curInteractorInfo = findAvailInteractor(userHandle, curRecognizer);
		curInteractorInfo = findAvailInteractor(userHandle, curRecognizer.getPackageName());
		if (curInteractorInfo != null) {
		// Looks good! We'll apply this one. To make it happen, we clear the
		// recognizer so that we don't think we have anything set and will
		@@ -159,6 +158,18 @@ public class VoiceInteractionManagerService extends SystemService {
		}
		}

		// If forceInteractorPackage exists, try to apply the interactor from this package if
		// possible and ignore the regular interactor setting.
		String forceInteractorPackage =
		getForceVoiceInteractionServicePackage(mContext.getResources());
		if (forceInteractorPackage != null) {
		curInteractorInfo = findAvailInteractor(userHandle, forceInteractorPackage);
		if (curInteractorInfo != null) {
		// We'll apply this one. Clear the recognizer and re-apply the settings.
		curRecognizer = null;
		}
		}

		// If we are on a svelte device, make sure an interactor is not currently
		// enabled; if it is, turn it off.
		if (!mEnableService && curInteractorStr != null) {
		@@ -218,8 +229,14 @@ public class VoiceInteractionManagerService extends SystemService {

		private boolean shouldEnableService(Resources res) {
		// VoiceInteractionService should not be enabled on low ram devices unless it has the config flag.
		return !ActivityManager.isLowRamDeviceStatic()
		\|\| res.getBoolean(com.android.internal.R.bool.config_forceEnableVoiceInteractionService);
		return !ActivityManager.isLowRamDeviceStatic() \|\|
		getForceVoiceInteractionServicePackage(res) != null;
		}

		private String getForceVoiceInteractionServicePackage(Resources res) {
		String interactorPackage =
		res.getString(com.android.internal.R.string.config_forceVoiceInteractionServicePackage);
		return TextUtils.isEmpty(interactorPackage) ? null : interactorPackage;
		}

		public void systemRunning(boolean safeMode) {
		@@ -272,7 +289,7 @@ public class VoiceInteractionManagerService extends SystemService {
		}
		}

		VoiceInteractionServiceInfo findAvailInteractor(int userHandle, ComponentName recognizer) {
		VoiceInteractionServiceInfo findAvailInteractor(int userHandle, String packageName) {
		List<ResolveInfo> available =
		mContext.getPackageManager().queryIntentServicesAsUser(
		new Intent(VoiceInteractionService.SERVICE_INTERFACE), 0, userHandle);
		@@ -293,8 +310,8 @@ public class VoiceInteractionManagerService extends SystemService {
		VoiceInteractionServiceInfo info = new VoiceInteractionServiceInfo(
		mContext.getPackageManager(), comp, userHandle);
		if (info.getParseError() == null) {
		if (recognizer == null \|\| info.getServiceInfo().packageName.equals(
		recognizer.getPackageName())) {
		if (packageName == null \|\| info.getServiceInfo().packageName.equals(
		packageName)) {
		if (foundInfo == null) {
		foundInfo = info;
		} else {