diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-03-07 16:08:59 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:08:59 -0800 |
| commit | 78c914f37a9891bc24f335fcf8c628beeb9310f5 (patch) | |
| tree | 6cc1271be0fe862e6e9997a2a32b58a0747e296d /services/audioflinger | |
| parent | ac3c33745f1a8b2153688903494522ed956027df (diff) | |
| parent | ffed04ac3c1dd01d66b3e96ec1314173309e7415 (diff) | |
| download | frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.zip frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.gz frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.bz2 | |
Merge "IAudioFlingerClient::ioConfigChanged param2 const"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 2 | ||||
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 608fc71..032406e 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -1053,7 +1053,7 @@ void AudioFlinger::removeNotificationClient(pid_t pid) } // audioConfigChanged_l() must be called with AudioFlinger::mLock held -void AudioFlinger::audioConfigChanged_l(int event, audio_io_handle_t ioHandle, void *param2) +void AudioFlinger::audioConfigChanged_l(int event, audio_io_handle_t ioHandle, const void *param2) { size_t size = mNotificationClients.size(); for (size_t i = 0; i < size; i++) { diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 518a99c..e26466f 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -1090,7 +1090,7 @@ private: // no range check, doesn't check per-thread stream volume, AudioFlinger::mLock held float streamVolume_l(audio_stream_type_t stream) const { return mStreamTypes[stream].volume; } - void audioConfigChanged_l(int event, audio_io_handle_t ioHandle, void *param2); + void audioConfigChanged_l(int event, audio_io_handle_t ioHandle, const void *param2); // allocate an audio_io_handle_t, session ID, or effect ID uint32_t nextUniqueId(); |