diff options
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/AudioRecord.cpp | 2 | ||||
| -rw-r--r-- | media/libmedia/IRemoteDisplay.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp index 5060525..8ea6306 100644 --- a/media/libmedia/AudioRecord.cpp +++ b/media/libmedia/AudioRecord.cpp @@ -177,7 +177,7 @@ status_t AudioRecord::set( // validate framecount int minFrameCount = 0; - status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelCount); + status_t status = getMinFrameCount(&minFrameCount, sampleRate, format, channelMask); if (status != NO_ERROR) { return status; } diff --git a/media/libmedia/IRemoteDisplay.cpp b/media/libmedia/IRemoteDisplay.cpp index 5d6ab34..da25a15 100644 --- a/media/libmedia/IRemoteDisplay.cpp +++ b/media/libmedia/IRemoteDisplay.cpp @@ -22,7 +22,7 @@ namespace android { enum { - DISCONNECT = IBinder::FIRST_CALL_TRANSACTION, + DISPOSE = IBinder::FIRST_CALL_TRANSACTION, }; class BpRemoteDisplay: public BpInterface<IRemoteDisplay> @@ -33,11 +33,11 @@ public: { } - status_t disconnect() + status_t dispose() { Parcel data, reply; data.writeInterfaceToken(IRemoteDisplay::getInterfaceDescriptor()); - remote()->transact(DISCONNECT, data, &reply); + remote()->transact(DISPOSE, data, &reply); return reply.readInt32(); } }; @@ -50,9 +50,9 @@ status_t BnRemoteDisplay::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { switch (code) { - case DISCONNECT: { + case DISPOSE: { CHECK_INTERFACE(IRemoteDisplay, data, reply); - reply->writeInt32(disconnect()); + reply->writeInt32(dispose()); return NO_ERROR; } default: |