Notify VIS of shutdown before switching implementations

This lets the implementation cleanup before it's destroyed.

Bug: 16629417
Change-Id: Ia717d461677e9ca8fa66f02c030aacad1597692d

1 files changed, 8 insertions, 7 deletions

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
index 94f227c..c0e536a 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java
@@ -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;