diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-26 16:25:36 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-26 16:25:36 -0700 |
commit | 489d60ec36c3927c9ee0bc14a44c1c77b74c09f6 (patch) | |
tree | cd777f51e68111af12a44dcd6001b28947a7e7dc /media/libmedia | |
parent | b7056fc8525e0515c6f46676e3307088f8b64cdc (diff) | |
parent | 172fb9ab347e146642234f0bd6f223d351e9fd0b (diff) | |
download | frameworks_av-489d60ec36c3927c9ee0bc14a44c1c77b74c09f6.zip frameworks_av-489d60ec36c3927c9ee0bc14a44c1c77b74c09f6.tar.gz frameworks_av-489d60ec36c3927c9ee0bc14a44c1c77b74c09f6.tar.bz2 |
am f3288f17: Merge change 2468 into donut
Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'
* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
setVolume did not check interface descriptor
Diffstat (limited to 'media/libmedia')
-rw-r--r-- | media/libmedia/IMediaPlayer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp index f9e83a0..e1bed5f 100644 --- a/media/libmedia/IMediaPlayer.cpp +++ b/media/libmedia/IMediaPlayer.cpp @@ -164,6 +164,7 @@ public: status_t setVolume(float leftVolume, float rightVolume) { Parcel data, reply; + data.writeInterfaceToken(IMediaPlayer::getInterfaceDescriptor()); data.writeFloat(leftVolume); data.writeFloat(rightVolume); remote()->transact(SET_VOLUME, data, &reply); @@ -255,6 +256,7 @@ status_t BnMediaPlayer::onTransact( return NO_ERROR; } break; case SET_VOLUME: { + CHECK_INTERFACE(IMediaPlayer, data, reply); reply->writeInt32(setVolume(data.readFloat(), data.readFloat())); return NO_ERROR; } break; |