Fix issue #30929080: Default Assist app is set to None... am: e9563659a5 am: 5cb766a9cd (6c8a66c2) · Commits · e / os / android_frameworks_base

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

+28 −0

Original line number	Diff line number	Diff line
		@@ -535,6 +535,18 @@ public class VoiceInteractionManagerService extends SystemService {
		+ " user=" + userHandle);
		}

		ComponentName getCurAssistant(int userHandle) {
		String curAssistant = Settings.Secure.getStringForUser(
		mContext.getContentResolver(),
		Settings.Secure.ASSISTANT, userHandle);
		if (TextUtils.isEmpty(curAssistant)) {
		return null;
		}
		if (DEBUG) Slog.d(TAG, "getCurAssistant curAssistant=" + curAssistant
		+ " user=" + userHandle);
		return ComponentName.unflattenFromString(curAssistant);
		}

		void resetCurAssistant(int userHandle) {
		Settings.Secure.putStringForUser(mContext.getContentResolver(),
		Settings.Secure.ASSISTANT, null, userHandle);
		@@ -1178,6 +1190,7 @@ public class VoiceInteractionManagerService extends SystemService {
		synchronized (VoiceInteractionManagerServiceStub.this) {
		ComponentName curInteractor = getCurInteractor(userHandle);
		ComponentName curRecognizer = getCurRecognizer(userHandle);
		ComponentName curAssistant = getCurAssistant(userHandle);
		if (curRecognizer == null) {
		// Could a new recognizer appear when we don't have one pre-installed?
		if (anyPackagesAppearing()) {
		@@ -1196,6 +1209,7 @@ public class VoiceInteractionManagerService extends SystemService {
		// the default config.
		setCurInteractor(null, userHandle);
		setCurRecognizer(null, userHandle);
		resetCurAssistant(userHandle);
		initForUser(userHandle);
		return;
		}
		@@ -1212,6 +1226,20 @@ public class VoiceInteractionManagerService extends SystemService {
		return;
		}

		if (curAssistant != null) {
		int change = isPackageDisappearing(curAssistant.getPackageName());
		if (change == PACKAGE_PERMANENT_CHANGE) {
		// If the currently set assistant is being removed, then we should
		// reset back to the default state (which is probably that we prefer
		// to have the default full voice interactor enabled).
		setCurInteractor(null, userHandle);
		setCurRecognizer(null, userHandle);
		resetCurAssistant(userHandle);
		initForUser(userHandle);
		return;
		}
		}

		// There is no interactor, so just deal with a simple recognizer.
		int change = isPackageDisappearing(curRecognizer.getPackageName());
		if (change == PACKAGE_PERMANENT_CHANGE