commit 489d60ec36c3927c9ee0bc14a44c1c77b74c09f6
author Android (Google) Code Review <android-gerrit@google.com> Tue May 26 16:25:36 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue May 26 16:25:36 2009 -0700
tree cd777f51e68111af12a44dcd6001b28947a7e7dc
parent b7056fc8525e0515c6f46676e3307088f8b64cdc
parent 172fb9ab347e146642234f0bd6f223d351e9fd0b

am f3288f17: Merge change 2468 into donut

Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860'

* commit 'f3288f178ae2b2c7910b234f54f43475a83eb860':
  setVolume did not check interface descriptor

media/libmedia/IMediaPlayer.cpp

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 @@
     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 @@
             return NO_ERROR;
         } break;
         case SET_VOLUME: {
+            CHECK_INTERFACE(IMediaPlayer, data, reply);
             reply->writeInt32(setVolume(data.readFloat(), data.readFloat()));
             return NO_ERROR;
         } break;