summaryrefslogtreecommitdiffstats
path: root/drm
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-14 07:58:25 -0800
committerMarco Nelissen <marcone@google.com>2014-11-14 14:01:03 -0800
commit06b46062d2f8bc82ca3061a23d197734ae51918b (patch)
tree3aee1330c3d65579643e50d105da35919ddc295f /drm
parente5a9eb684921b75919b1a7fee97259b0ca48bd47 (diff)
downloadframeworks_av-06b46062d2f8bc82ca3061a23d197734ae51918b.zip
frameworks_av-06b46062d2f8bc82ca3061a23d197734ae51918b.tar.gz
frameworks_av-06b46062d2f8bc82ca3061a23d197734ae51918b.tar.bz2
Update calls to IInterface::asBinder()
to use the new static version. Change-Id: I89a5988a0ac694ffc04d88cf939e8455bf925d4c
Diffstat (limited to 'drm')
-rw-r--r--drm/common/IDrmManagerService.cpp3
-rw-r--r--drm/libdrmframework/DrmManagerClientImpl.cpp2
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);
}
}