LineageOS/android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."

Browse Source 
* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
  DRM Framework bug fixes.
This commit is contained in:
Gloria Wang
2011-01-11 14:55:56 -08:00
committed by Android Git Automerger
parent b03f5627d4 9cfc9eff42
commit ac2652c25f
4 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drm/libdrmframework/DrmManagerClientImpl.cpp
View File

@@ -81,7 +81,8 @@ status_t DrmManagerClientImpl::setOnInfoListener(
int uniqueId, const sp<DrmManagerClient::OnInfoListener>& infoListener) {
Mutex::Autolock _l(mLock);
mOnInfoListener = infoListener;
return getDrmManagerService()->setDrmServiceListener(uniqueId, this);
return getDrmManagerService()->setDrmServiceListener(uniqueId,
(NULL != infoListener.get()) ? this : NULL);
}
status_t DrmManagerClientImpl::installDrmEngine(int uniqueId, const String8& drmEngineFile) {