Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b875bee authored by Atneya Nair's avatar Atneya Nair
Browse files

Remove SoundTriggerInternal dump 

SoundTriggerService should implement dump itself, rather
than exposing an interface.

Bug: 272147641
Bug: 278105467
Test: Compiles
Change-Id: I5649ff919afddc14358f7dca9cfb81568096b4b4
parent 7040c129

services/core/java/com/android/server/SoundTriggerInternal.java

+0 −10
Original line number Diff line number Diff line
@@ -52,11 +52,6 @@ public interface SoundTriggerInternal { 
    // 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 @@ public interface SoundTriggerInternal { 
         * Unloads (and stops if running) the given keyphraseId

         */

        int unloadKeyphraseModel(int keyphaseId);



        /**

         * Dumps session-wide information.

         */

        void dump(FileDescriptor fd, PrintWriter pw, String[] args);

    }

}

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java

+0 −9
Original line number Diff line number Diff line
@@ -1116,15 +1116,6 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { 
        }

    }



    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;

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+0 −17
Original line number Diff line number Diff line
@@ -1672,11 +1672,6 @@ public class SoundTriggerService extends SystemService { 
                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 @@ public class SoundTriggerService extends SystemService { 
                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);

        }

    }



    //=================================================================

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

+0 −2
Original line number Diff line number Diff line
@@ -2138,8 +2138,6 @@ public class VoiceInteractionManagerService extends SystemService { 
                    mImpl.dumpLocked(fd, pw, args);

                }

            }



            mSoundTriggerInternal.dump(fd, pw, args);

        }



        @Override