diff options
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/common_time/common_clock_service.cpp | 10 | ||||
| -rw-r--r-- | libs/storage/IMountService.cpp | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libs/common_time/common_clock_service.cpp b/libs/common_time/common_clock_service.cpp index 9ca6f35..592ab1d 100644 --- a/libs/common_time/common_clock_service.cpp +++ b/libs/common_time/common_clock_service.cpp @@ -99,14 +99,14 @@ status_t CommonClockService::registerListener( Mutex::Autolock lock(mCallbackLock); // check whether this is a duplicate for (size_t i = 0; i < mListeners.size(); i++) { - if (mListeners[i]->asBinder() == listener->asBinder()) + if (IInterface::asBinder(mListeners[i]) == IInterface::asBinder(listener)) return ALREADY_EXISTS; } } mListeners.add(listener); mTimeServer.reevaluateAutoDisableState(0 != mListeners.size()); - return listener->asBinder()->linkToDeath(this); + return IInterface::asBinder(listener)->linkToDeath(this); } status_t CommonClockService::unregisterListener( @@ -117,8 +117,8 @@ status_t CommonClockService::unregisterListener( { // scoping for autolock pattern Mutex::Autolock lock(mCallbackLock); for (size_t i = 0; i < mListeners.size(); i++) { - if (mListeners[i]->asBinder() == listener->asBinder()) { - mListeners[i]->asBinder()->unlinkToDeath(this); + if (IInterface::asBinder(mListeners[i]) == IInterface::asBinder(listener)) { + IInterface::asBinder(mListeners[i])->unlinkToDeath(this); mListeners.removeAt(i); ret_val = OK; break; @@ -136,7 +136,7 @@ void CommonClockService::binderDied(const wp<IBinder>& who) { { // scoping for autolock pattern Mutex::Autolock lock(mCallbackLock); for (size_t i = 0; i < mListeners.size(); i++) { - if (mListeners[i]->asBinder() == who) { + if (IInterface::asBinder(mListeners[i]) == who) { mListeners.removeAt(i); break; } diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp index 7ac7737..c643ed0 100644 --- a/libs/storage/IMountService.cpp +++ b/libs/storage/IMountService.cpp @@ -64,7 +64,7 @@ public: { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); - data.writeStrongBinder(listener->asBinder()); + data.writeStrongBinder(IInterface::asBinder(listener)); if (remote()->transact(TRANSACTION_registerListener, data, &reply) != NO_ERROR) { ALOGD("registerListener could not contact remote\n"); return; @@ -80,7 +80,7 @@ public: { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); - data.writeStrongBinder(listener->asBinder()); + data.writeStrongBinder(IInterface::asBinder(listener)); if (remote()->transact(TRANSACTION_unregisterListener, data, &reply) != NO_ERROR) { ALOGD("unregisterListener could not contact remote\n"); return; @@ -413,7 +413,7 @@ public: { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); - data.writeStrongBinder(observer->asBinder()); + data.writeStrongBinder(IInterface::asBinder(observer)); if (remote()->transact(TRANSACTION_shutdown, data, &reply) != NO_ERROR) { ALOGD("shutdown could not contact remote\n"); return; @@ -450,7 +450,7 @@ public: data.writeString16(rawPath); data.writeString16(canonicalPath); data.writeString16(key); - data.writeStrongBinder(token->asBinder()); + data.writeStrongBinder(IInterface::asBinder(token)); data.writeInt32(nonce); if (remote()->transact(TRANSACTION_mountObb, data, &reply) != NO_ERROR) { ALOGD("mountObb could not contact remote\n"); @@ -470,7 +470,7 @@ public: data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(filename); data.writeInt32(force ? 1 : 0); - data.writeStrongBinder(token->asBinder()); + data.writeStrongBinder(IInterface::asBinder(token)); data.writeInt32(nonce); if (remote()->transact(TRANSACTION_unmountObb, data, &reply) != NO_ERROR) { ALOGD("unmountObb could not contact remote\n"); |