summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IMediaPlayer.cpp
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 16:23:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-26 16:23:08 -0700
commitf3288f178ae2b2c7910b234f54f43475a83eb860 (patch)
tree047993975735033a426ada45ec36d28e5eb17bc9 /media/libmedia/IMediaPlayer.cpp
parentfdacdcb6546b976b437dfc97e286cd1733e7bf93 (diff)
parent814941997f3f4b53064511b658cb510cafffe117 (diff)
downloadframeworks_base-f3288f178ae2b2c7910b234f54f43475a83eb860.zip
frameworks_base-f3288f178ae2b2c7910b234f54f43475a83eb860.tar.gz
frameworks_base-f3288f178ae2b2c7910b234f54f43475a83eb860.tar.bz2
Merge change 2468 into donut
* changes: setVolume did not check interface descriptor DO NOT MERGE
Diffstat (limited to 'media/libmedia/IMediaPlayer.cpp')
-rw-r--r--media/libmedia/IMediaPlayer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/IMediaPlayer.cpp b/media/libmedia/IMediaPlayer.cpp
index f37519f..f18765a 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);
@@ -261,6 +262,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;