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

Commit cc3a46ad authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Also reset assist setting when force stopping assist 

Bug: 20882522
Change-Id: I57725586ab5ff203b378a1e6d2e5e77a47fd2448
parent 450176c5

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);

                    }