Merge "Cancel voice assist session on user switch" into mnc-dev (327c3641) · Commits · e / os / android_frameworks_base

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