diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java index ca4716bacc2f2..064c0ad41d5ca 100644 --- a/core/java/android/service/voice/VoiceInteractionService.java +++ b/core/java/android/service/voice/VoiceInteractionService.java @@ -766,11 +766,13 @@ public class VoiceInteractionService extends Service { protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("VOICE INTERACTION"); synchronized (mLock) { - pw.println(" Sandboxed Detector(s)"); + pw.println(" Sandboxed Detector(s):"); if (mActiveDetectors.size() == 0) { - pw.println(" NULL"); + pw.println(" No detector."); } else { mActiveDetectors.forEach(detector -> { + pw.print(" Using sandboxed detection service="); + pw.println(detector.isUsingSandboxedDetectionService()); detector.dump(" ", pw); pw.println(); }); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java index cc228474b0424..b672b00fa8c3c 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/HotwordDetectionConnection.java @@ -578,18 +578,19 @@ final class HotwordDetectionConnection { public void dump(String prefix, PrintWriter pw) { synchronized (mLock) { pw.print(prefix); pw.print("mReStartPeriodSeconds="); pw.println(mReStartPeriodSeconds); - pw.print(prefix); pw.print("mBound="); + pw.print(prefix); pw.print("bound for HotwordDetectionService="); pw.println(mRemoteHotwordDetectionService != null && mRemoteHotwordDetectionService.isBound()); + pw.print(prefix); pw.print("bound for VisualQueryDetectionService="); pw.println(mRemoteVisualQueryDetectionService != null && mRemoteHotwordDetectionService != null && mRemoteHotwordDetectionService.isBound()); pw.print(prefix); pw.print("mRestartCount="); pw.println(mRestartCount); pw.print(prefix); pw.print("mLastRestartInstant="); pw.println(mLastRestartInstant); - pw.print(prefix); pw.print("mDetectorType="); - pw.println(HotwordDetector.detectorTypeToString(mDetectorType)); - pw.print(prefix); pw.println("DetectorSession(s)"); + pw.print(prefix); pw.println("DetectorSession(s):"); + pw.print(prefix); pw.print("Num of DetectorSession(s)="); + pw.println(mDetectorSessions.size()); runForEachDetectorSessionLocked((session) -> { session.dumpLocked(prefix, pw); }); diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java index 3dbd269a4adc4..ad0e9217c50b4 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerServiceImpl.java @@ -986,6 +986,8 @@ class VoiceInteractionManagerServiceImpl implements VoiceInteractionSessionConne if (mHotwordDetectionConnection != null) { pw.println(" Hotword detection connection:"); mHotwordDetectionConnection.dump(" ", pw); + } else { + pw.println(" No Hotword detection connection"); } if (mActiveSession != null) { pw.println(" Active session:");