Merge "Remove SoundTriggerInternal dump" into udc-dev
diff --git a/services/core/java/com/android/server/SoundTriggerInternal.java b/services/core/java/com/android/server/SoundTriggerInternal.java
index 6529465..f184574 100644
--- a/services/core/java/com/android/server/SoundTriggerInternal.java
+++ b/services/core/java/com/android/server/SoundTriggerInternal.java
@@ -52,11 +52,6 @@
// Enumerate possible STModules to attach to
List<ModuleProperties> listModuleProperties(Identity originatorIdentity);
- /**
- * Dumps service-wide information.
- */
- void dump(FileDescriptor fd, PrintWriter pw, String[] args);
-
interface Session {
/**
* Starts recognition for the given keyphraseId.
@@ -151,10 +146,5 @@
* Unloads (and stops if running) the given keyphraseId
*/
int unloadKeyphraseModel(int keyphaseId);
-
- /**
- * Dumps session-wide information.
- */
- void dump(FileDescriptor fd, PrintWriter pw, String[] args);
}
}
diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
index 18d0c5a..efe3009 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
@@ -1116,15 +1116,6 @@
}
}
- void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- synchronized (mLock) {
- pw.print(" module properties=");
- pw.print(" call active=");
- pw.println(mCallActive);
- pw.println(" SoundTrigger Power State=" + mSoundTriggerPowerSaveMode);
- }
- }
-
private void initializeDeviceStateListeners() {
if (mRecognitionRequested) {
return;
diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
index 46e634f..b6673ad 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -1672,11 +1672,6 @@
return mSoundTriggerHelper.unloadKeyphraseSoundModel(keyphraseId);
}
- @Override
- public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- mSoundTriggerHelper.dump(fd, pw, args);
- }
-
private void clientDied() {
Slog.w(TAG, "Client died, cleaning up session.");
sEventLogger.enqueue(new EventLogger.StringEvent(
@@ -1697,18 +1692,6 @@
return listUnderlyingModuleProperties(originatorIdentity);
}
}
-
- @Override
- public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- // log
- sEventLogger.dump(pw);
-
- // enrolled models
- mDbHelper.dump(pw);
-
- // stats
- mSoundModelStatTracker.dump(pw);
- }
}
//=================================================================
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index bb50c79..27f3fb3 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -2138,8 +2138,6 @@
mImpl.dumpLocked(fd, pw, args);
}
}
-
- mSoundTriggerInternal.dump(fd, pw, args);
}
@Override