diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-17 18:19:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-17 18:19:15 +0000 |
| commit | e78a27ca9c701aa996eee0e47fa26dd69d80ffcf (patch) | |
| tree | 670ed8d454145e88076adef380a802b9788d20a8 /drm | |
| parent | bb0cf4d079290c8885e11c310c531ece23323d61 (diff) | |
| parent | 9b77083e582a8b6088ac6a2cb4151dfbdd324557 (diff) | |
| download | frameworks_av-e78a27ca9c701aa996eee0e47fa26dd69d80ffcf.zip frameworks_av-e78a27ca9c701aa996eee0e47fa26dd69d80ffcf.tar.gz frameworks_av-e78a27ca9c701aa996eee0e47fa26dd69d80ffcf.tar.bz2 | |
am 9b77083e: Merge "Update calls to IInterface::asBinder()"
* commit '9b77083e582a8b6088ac6a2cb4151dfbdd324557':
Update calls to IInterface::asBinder()
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/common/IDrmManagerService.cpp | 3 | ||||
| -rw-r--r-- | drm/libdrmframework/DrmManagerClientImpl.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index 36cb612..3f62ed7 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -148,8 +148,7 @@ status_t BpDrmManagerService::setDrmServiceListener( data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInt32(uniqueId); - data.writeStrongBinder( - drmServiceListener != NULL ? drmServiceListener->asBinder() : NULL); + data.writeStrongBinder(IInterface::asBinder(drmServiceListener)); remote()->transact(SET_DRM_SERVICE_LISTENER, data, &reply); return reply.readInt32(); } diff --git a/drm/libdrmframework/DrmManagerClientImpl.cpp b/drm/libdrmframework/DrmManagerClientImpl.cpp index 2d2c90e..9457bb6 100644 --- a/drm/libdrmframework/DrmManagerClientImpl.cpp +++ b/drm/libdrmframework/DrmManagerClientImpl.cpp @@ -346,7 +346,7 @@ status_t DrmManagerClientImpl::notify(const DrmInfoEvent& event) { DrmManagerClientImpl::DeathNotifier::~DeathNotifier() { Mutex::Autolock lock(sMutex); if (NULL != sDrmManagerService.get()) { - sDrmManagerService->asBinder()->unlinkToDeath(this); + IInterface::asBinder(sDrmManagerService)->unlinkToDeath(this); } } |