diff options
| author | Marco Nelissen <marcone@google.com> | 2014-11-14 07:58:25 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2014-11-17 10:05:07 -0800 |
| commit | f888020c6e2735624f2b2a30e72aca24e17b8b4d (patch) | |
| tree | 76d92b7a91a4bebd4e84d6afdc2ef4a2e4943df8 /drm | |
| parent | d02641098b16df2fd4cd32b72a30eb6f3b64e12b (diff) | |
| download | frameworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.zip frameworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.tar.gz frameworks_av-f888020c6e2735624f2b2a30e72aca24e17b8b4d.tar.bz2 | |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
Conflicts:
media/libmedia/IAudioFlinger.cpp
media/libmedia/IMediaPlayer.cpp
media/libstagefright/CameraSource.cpp
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); } } |