diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-22 20:10:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-22 20:10:57 +0000 |
| commit | 6221547f1cef87c3ddea26a7936d01e33c9b4115 (patch) | |
| tree | 87ca2a40d4a3fec80715a68ec4c67a7358fc9faf | |
| parent | d20940ee9e9da7495a75569ccc513b4aa3ddc179 (diff) | |
| parent | 9707ffaf0b574b7929d62b2fe683595e95ef7774 (diff) | |
| download | frameworks_av-6221547f1cef87c3ddea26a7936d01e33c9b4115.zip frameworks_av-6221547f1cef87c3ddea26a7936d01e33c9b4115.tar.gz frameworks_av-6221547f1cef87c3ddea26a7936d01e33c9b4115.tar.bz2 | |
am 9707ffaf: am fd7e0440: Merge "Check for NULL before calling asBinder()."
* commit '9707ffaf0b574b7929d62b2fe683595e95ef7774':
Check for NULL before calling asBinder().
| -rw-r--r-- | drm/common/IDrmManagerService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp index db41e0b..36cb612 100644 --- a/drm/common/IDrmManagerService.cpp +++ b/drm/common/IDrmManagerService.cpp @@ -148,7 +148,8 @@ status_t BpDrmManagerService::setDrmServiceListener( data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInt32(uniqueId); - data.writeStrongBinder(drmServiceListener->asBinder()); + data.writeStrongBinder( + drmServiceListener != NULL ? drmServiceListener->asBinder() : NULL); remote()->transact(SET_DRM_SERVICE_LISTENER, data, &reply); return reply.readInt32(); } |