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

Commit dea3864b authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am b6ab0ca3: am cc3a46ad: Also reset assist setting when force stopping assist 

* commit 'b6ab0ca3':
  Also reset assist setting when force stopping assist
parents 06121b67 b6ab0ca3

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

+6 −0
Original line number Diff line number Diff line
@@ -433,6 +433,11 @@ public class VoiceInteractionManagerService extends SystemService { 
                    + " user=" + userHandle);

        }



        void resetCurAssistant(int userHandle) {

            Settings.Secure.putStringForUser(mContext.getContentResolver(),

                    Settings.Secure.ASSISTANT, null, userHandle);

        }



        @Override

        public void showSession(IVoiceInteractionService service, Bundle args, int flags) {

            synchronized (this) {
@@ -897,6 +902,7 @@ public class VoiceInteractionManagerService extends SystemService { 
                        }

                        setCurInteractor(null, userHandle);

                        setCurRecognizer(null, userHandle);

                        resetCurAssistant(userHandle);

                        initForUser(userHandle);

                        switchImplementationIfNeededLocked(true);

                    }