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 | 7e432e0c68017b760dce441144d724175dc3039d (patch) | |
| tree | 17ee332832d39798e0c5eedbd469abd6465df9f4 /media | |
| parent | aaf834a284a025cedd8ec1cf01d09e1790c1dcf8 (diff) | |
| parent | f3288f178ae2b2c7910b234f54f43475a83eb860 (diff) | |
| download | frameworks_base-7e432e0c68017b760dce441144d724175dc3039d.zip frameworks_base-7e432e0c68017b760dce441144d724175dc3039d.tar.gz frameworks_base-7e432e0c68017b760dce441144d724175dc3039d.tar.bz2 | |
am f3288f17: Merge change 2468 into donut
Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'
* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
setVolume did not check interface descriptor
Diffstat (limited to 'media')
| -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; |