am e444b911: am 5b02e931: Notify VIS of shutdown before switching implementations (514af2c2) · Commits · e / os / android_frameworks_base

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

+8 −7

Original line number	Diff line number	Diff line
		@@ -96,13 +96,6 @@ class VoiceInteractionManagerServiceImpl {

		@Override
		public void onServiceDisconnected(ComponentName name) {
		try {
		if (mService != null) {
		mService.shutdown();
		}
		} catch (RemoteException e) {
		Slog.w(TAG, "RemoteException in shutdown", e);
		}
		mService = null;
		}
		};
		@@ -307,6 +300,14 @@ class VoiceInteractionManagerServiceImpl {
		}

		void shutdownLocked() {
		try {
		if (mService != null) {
		mService.shutdown();
		}
		} catch (RemoteException e) {
		Slog.w(TAG, "RemoteException in shutdown", e);
		}

		if (mBound) {
		mContext.unbindService(mConnection);
		mBound = false;