summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/Drm.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-11-17 18:19:15 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 18:19:15 +0000
commite78a27ca9c701aa996eee0e47fa26dd69d80ffcf (patch)
tree670ed8d454145e88076adef380a802b9788d20a8 /media/libmediaplayerservice/Drm.cpp
parentbb0cf4d079290c8885e11c310c531ece23323d61 (diff)
parent9b77083e582a8b6088ac6a2cb4151dfbdd324557 (diff)
downloadframeworks_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 'media/libmediaplayerservice/Drm.cpp')
-rw-r--r--media/libmediaplayerservice/Drm.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp
index d222316..89d689d 100644
--- a/media/libmediaplayerservice/Drm.cpp
+++ b/media/libmediaplayerservice/Drm.cpp
@@ -84,10 +84,10 @@ status_t Drm::setListener(const sp<IDrmClient>& listener)
{
Mutex::Autolock lock(mEventLock);
if (mListener != NULL){
- mListener->asBinder()->unlinkToDeath(this);
+ IInterface::asBinder(mListener)->unlinkToDeath(this);
}
if (listener != NULL) {
- listener->asBinder()->linkToDeath(this);
+ IInterface::asBinder(listener)->linkToDeath(this);
}
mListener = listener;
return NO_ERROR;