commit 426836013ea5528d9aad074ccc5a2e8c14e93238
author Charles Chen <liangyuchen@google.com> Thu Jan 26 07:20:30 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 26 07:20:30 2023 +0000
tree 2b27a4c19650d9cde138ac836467272033daedaf
parent fbdeddab65b84e69b18464d302d1ad5b66746cb5
parent 57b3fe5ad9adecb65bdb372d796f25b56e751db3

Merge "Perform checking for restarting SandboxedDetectionProcesses"

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

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
index 22cce1b..591e35a 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java
@@ -445,9 +445,15 @@
         // Recreate connection to reset the cache.
         mRestartCount++;
 
-        mRemoteHotwordDetectionService = mHotwordDetectionServiceConnectionFactory.createLocked();
-        mRemoteVisualQueryDetectionService =
-                mVisualQueryDetectionServiceConnectionFactory.createLocked();
+        if (oldHotwordConnection != null) {
+            mRemoteHotwordDetectionService =
+                    mHotwordDetectionServiceConnectionFactory.createLocked();
+        }
+
+        if (oldVisualQueryDetectionConnection != null) {
+            mRemoteVisualQueryDetectionService =
+                    mVisualQueryDetectionServiceConnectionFactory.createLocked();
+        }
 
         Slog.v(TAG, "Started the new process, dispatching processRestarted to detector");
         runForEachDetectorSessionLocked((session) -> {