Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac2652c2 authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

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

* commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d':
  DRM Framework bug fixes.
parents b03f5627 9cfc9eff

drm/drmserver/DrmManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -117,7 +117,11 @@ status_t DrmManager::unloadPlugIns() { 
status_t DrmManager::setDrmServiceListener(

            int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) {

    Mutex::Autolock _l(mLock);

    if (NULL != drmServiceListener.get()) {

        mServiceListeners.add(uniqueId, drmServiceListener);

    } else {

        mServiceListeners.removeItem(uniqueId);

    }

    return DRM_NO_ERROR;

}

drm/libdrmframework/DrmManagerClient.cpp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ DrmManagerClient::DrmManagerClient(): 
DrmManagerClient::~DrmManagerClient() {

    DrmManagerClientImpl::remove(mUniqueId);

    mDrmManagerClientImpl->removeClient(mUniqueId);

    mDrmManagerClientImpl->setOnInfoListener(mUniqueId, NULL);

    delete mDrmManagerClientImpl; mDrmManagerClientImpl = NULL;

}

drm/libdrmframework/DrmManagerClientImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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) {

include/drm/DrmManagerClient.h

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,9 @@ public: 
public:

    class OnInfoListener: virtual public RefBase {



    public:

        virtual ~OnInfoListener() {}



    public:

        virtual void onInfo(const DrmInfoEvent& event) = 0;

    };