summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-07 16:08:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-07 16:08:59 -0800
commit78c914f37a9891bc24f335fcf8c628beeb9310f5 (patch)
tree6cc1271be0fe862e6e9997a2a32b58a0747e296d /include
parentac3c33745f1a8b2153688903494522ed956027df (diff)
parentffed04ac3c1dd01d66b3e96ec1314173309e7415 (diff)
downloadframeworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.zip
frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.gz
frameworks_base-78c914f37a9891bc24f335fcf8c628beeb9310f5.tar.bz2
Merge "IAudioFlingerClient::ioConfigChanged param2 const"
Diffstat (limited to 'include')
-rw-r--r--include/media/AudioSystem.h4
-rw-r--r--include/media/IAudioFlingerClient.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h
index 89bc95d..d54ab35 100644
--- a/include/media/AudioSystem.h
+++ b/include/media/AudioSystem.h
@@ -218,8 +218,8 @@ private:
// IAudioFlingerClient
// indicate a change in the configuration of an output or input: keeps the cached
- // values for output/input parameters upto date in client process
- virtual void ioConfigChanged(int event, audio_io_handle_t ioHandle, void *param2);
+ // values for output/input parameters up-to-date in client process
+ virtual void ioConfigChanged(int event, audio_io_handle_t ioHandle, const void *param2);
};
class AudioPolicyServiceClient: public IBinder::DeathRecipient
diff --git a/include/media/IAudioFlingerClient.h b/include/media/IAudioFlingerClient.h
index f3b4df1..75a9971 100644
--- a/include/media/IAudioFlingerClient.h
+++ b/include/media/IAudioFlingerClient.h
@@ -33,7 +33,7 @@ public:
DECLARE_META_INTERFACE(AudioFlingerClient);
// Notifies a change of audio input/output configuration.
- virtual void ioConfigChanged(int event, audio_io_handle_t ioHandle, void *param2) = 0;
+ virtual void ioConfigChanged(int event, audio_io_handle_t ioHandle, const void *param2) = 0;
};