1 files changed, 5 insertions, 37 deletions

diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp
index 1d1b72238acb..d58834b81684 100644
--- a/media/libmedia/IAudioFlinger.cpp
+++ b/media/libmedia/IAudioFlinger.cpp
@@ -69,8 +69,7 @@ enum {
     QUERY_EFFECT,
     GET_EFFECT_DESCRIPTOR,
     CREATE_EFFECT,
-    MOVE_EFFECTS,
-    READ_INPUT
+    MOVE_EFFECTS
 };
 
 class BpAudioFlinger : public BpInterface<IAudioFlinger>
@@ -433,8 +432,7 @@ public:
                             uint32_t *pSamplingRate,
                             uint32_t *pFormat,
                             uint32_t *pChannels,
-                            uint32_t acoustics,
-                            uint32_t *pInputClientId)
+                            uint32_t acoustics)
     {
         Parcel data, reply;
         uint32_t devices = pDevices ? *pDevices : 0;
@@ -448,7 +446,6 @@ public:
         data.writeInt32(format);
         data.writeInt32(channels);
         data.writeInt32(acoustics);
-        data.writeIntPtr((intptr_t)pInputClientId);
         remote()->transact(OPEN_INPUT, data, &reply);
         int input = reply.readInt32();
         devices = reply.readInt32();
@@ -462,12 +459,11 @@ public:
         return input;
     }
 
-    virtual status_t closeInput(int input, uint32_t *inputClientId)
+    virtual status_t closeInput(int input)
     {
         Parcel data, reply;
         data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
         data.writeInt32(input);
-        data.writeIntPtr((intptr_t) inputClientId);
         remote()->transact(CLOSE_INPUT, data, &reply);
         return reply.readInt32();
     }
@@ -520,20 +516,6 @@ public:
         return reply.readInt32();
     }
 
-    virtual size_t readInput(uint32_t *input, uint32_t inputClientId, void *buffer, uint32_t bytes, uint32_t *pOverwrittenBytes)
-    {
-        Parcel data, reply;
-        data.writeInterfaceToken(IAudioFlinger::getInterfaceDescriptor());
-        data.writeIntPtr((intptr_t) input);
-        data.writeInt32(inputClientId);
-        data.writeIntPtr((intptr_t) buffer);
-        data.writeInt32(bytes);
-        data.writeIntPtr((intptr_t) pOverwrittenBytes);
-        remote()->transact(READ_INPUT, data, &reply);
-
-        return reply.readInt32();
-    }
-
     virtual int newAudioSessionId()
     {
         Parcel data, reply;
@@ -900,14 +882,12 @@ status_t BnAudioFlinger::onTransact(
             uint32_t format = data.readInt32();
             uint32_t channels = data.readInt32();
             uint32_t acoutics = data.readInt32();
-            uint32_t *inputClientId = (uint32_t*) data.readIntPtr();
 
             int input = openInput(&devices,
                                      &samplingRate,
                                      &format,
                                      &channels,
-                                     acoutics,
-                                     inputClientId);
+                                     acoutics);
             reply->writeInt32(input);
             reply->writeInt32(devices);
             reply->writeInt32(samplingRate);
@@ -917,9 +897,7 @@ status_t BnAudioFlinger::onTransact(
         } break;
         case CLOSE_INPUT: {
             CHECK_INTERFACE(IAudioFlinger, data, reply);
-            uint32_t input = data.readInt32();
-            uint32_t *inputClientId = (uint32_t*) data.readIntPtr();
-            reply->writeInt32(closeInput(input, inputClientId));
+            reply->writeInt32(closeInput(data.readInt32()));
             return NO_ERROR;
         } break;
         case SET_STREAM_OUTPUT: {
@@ -1032,16 +1010,6 @@ status_t BnAudioFlinger::onTransact(
             reply->writeInt32(moveEffects(session, srcOutput, dstOutput));
             return NO_ERROR;
         } break;
-        case READ_INPUT: {
-            CHECK_INTERFACE(IAudioFlinger, data, reply);
-            uint32_t* input = (uint32_t*) data.readIntPtr();
-            uint32_t inputClientId = data.readInt32();
-            void* buffer = (void*) data.readIntPtr();
-            uint32_t bytes = data.readInt32();
-            uint32_t *pOverwrittenBytes = (uint32_t*) data.readIntPtr();
-            reply->writeInt32(readInput(input, inputClientId, buffer, bytes, pOverwrittenBytes));
-            return NO_ERROR;
-        } break;
         default:
             return BBinder::onTransact(code, data, reply, flags);
     }