commit 611ebb95e76c230214780b7b583b8a3c5277ac7a
author Eric Laurent <elaurent@google.com> Mon Apr 16 19:43:59 2018 +0000
committer Eric Laurent <elaurent@google.com> Mon Apr 16 19:43:59 2018 +0000
tree 1c8ef30309a0954a51a6b4c872f30ca399f064d2
parent a2f478ca0b2bda8db9b321f0cfa9e9d3cf6130f9

Revert "audioflinger: implement silenced capture for mmap"

This reverts commit a2f478ca0b2bda8db9b321f0cfa9e9d3cf6130f9.

Bug: 78118584
Change-Id: Ie0da3dea445f2474c7a889c5f9919305c1c96d40

services/audioflinger/Threads.h

diff --git a/services/audioflinger/Threads.h b/services/audioflinger/Threads.h
index bc4a534..5a5961a 100644
--- a/services/audioflinger/Threads.h
+++ b/services/audioflinger/Threads.h
@@ -1589,7 +1589,6 @@
     virtual     void        threadLoop_exit();
     virtual     void        threadLoop_standby();
     virtual     bool        shouldStandby_l() { return false; }
-    virtual     status_t    exitStandby();
 
     virtual     status_t    initCheck() const { return (mHalStream == 0) ? NO_INIT : NO_ERROR; }
     virtual     size_t      frameCount() const { return mFrameCount; }
@@ -1622,9 +1621,6 @@
 
     virtual     void        invalidateTracks(audio_stream_type_t streamType __unused) {}
 
-                // Sets the UID records silence
-    virtual     void        setRecordSilenced(uid_t uid __unused, bool silenced __unused) {}
-
                 void        dump(int fd, const Vector<String16>& args);
     virtual     void        dumpInternals(int fd, const Vector<String16>& args);
                 void        dumpTracks(int fd, const Vector<String16>& args);
@@ -1641,9 +1637,6 @@
                 sp<DeviceHalInterface>  mHalDevice;
                 AudioHwDevice* const    mAudioHwDev;
                 ActiveTracks<MmapTrack> mActiveTracks;
-
-                int32_t                 mNoCallbackWarningCount;
-     static     constexpr int32_t       kMaxNoCallbackWarnings = 5;
 };
 
 class MmapPlaybackThread : public MmapThread, public VolumeInterface
@@ -1677,7 +1670,7 @@
 
     virtual     audio_stream_type_t streamType() { return mStreamType; }
     virtual     void        checkSilentMode_l();
-                void        processVolume_l() override;
+    virtual     void        processVolume_l();
 
     virtual     void        dumpInternals(int fd, const Vector<String16>& args);
 
@@ -1693,6 +1686,8 @@
                 bool                        mMasterMute;
                 bool                        mStreamMute;
                 float                       mHalVolFloat;
+                int32_t                     mNoCallbackWarningCount;
+     static     constexpr int32_t           kMaxNoCallbackWarnings = 5;
                 AudioStreamOut*             mOutput;
 };
 
@@ -1707,12 +1702,9 @@
 
                 AudioStreamIn* clearInput();
 
-                status_t       exitStandby() override;
     virtual     bool           isOutput() const override { return false; }
 
                 void           updateMetadata_l() override;
-                void           processVolume_l() override;
-                void           setRecordSilenced(uid_t uid, bool silenced) override;
 
 protected: