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

Commit f59ae7ce authored by James Cook's avatar James Cook Committed by Android Git Automerger
Browse files

am 563a268e: am 477c746e: am 327c3641: Merge "Cancel voice assist session on... 

am 563a268e: am 477c746e: am 327c3641: Merge "Cancel voice assist session on user switch" into mnc-dev

* commit '563a268e':
  Cancel voice assist session on user switch
parents ea906935 563a268e

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

+6 −0
Original line number Diff line number Diff line
@@ -248,6 +248,12 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne 
    }



    void shutdownLocked() {

        // If there is an active session, cancel it to allow it to clean up its window and other

        // state.

        if (mActiveSession != null) {

            mActiveSession.cancel();

            mActiveSession = null;

        }

        try {

            if (mService != null) {

                mService.shutdown();