Revert^3 "Reapply "AudioFlinger: Control volume using Port ID""
This reverts commit 98c44f36c95fd01ffc6f44b894e41c3140b9ed7e.
Reason for revert: Potential culprit for b/362363068- verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ic97eda49fbcccc6e47357d17a552d24960a1a393
diff --git a/services/audioflinger/MmapTracks.h b/services/audioflinger/MmapTracks.h
index 8758bd0..85ce142 100644
--- a/services/audioflinger/MmapTracks.h
+++ b/services/audioflinger/MmapTracks.h
@@ -35,8 +35,7 @@
bool isOut,
const android::content::AttributionSourceState& attributionSource,
pid_t creatorPid,
- audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE,
- float volume = 0.0f);
+ audio_port_handle_t portId = AUDIO_PORT_HANDLE_NONE);
~MmapTrack() override;
status_t initCheck() const final;
@@ -66,13 +65,6 @@
void processMuteEvent_l(const sp<IAudioManager>& audioManager,
mute_state_t muteState)
/* REQUIRES(MmapPlaybackThread::mLock) */ final;
-
- // VolumePortInterface implementation
- void setPortVolume(float volume) override {
- mVolume = volume;
- }
- float getPortVolume() const override { return mVolume; }
-
private:
DISALLOW_COPY_AND_ASSIGN(MmapTrack);
@@ -95,8 +87,6 @@
/* GUARDED_BY(MmapPlaybackThread::mLock) */;
mute_state_t mMuteState
/* GUARDED_BY(MmapPlaybackThread::mLock) */;
-
- float mVolume = 0.0f;
}; // end of Track
} // namespace android
\ No newline at end of file