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

Commit 09ba5ceb authored by Gloria Wang's avatar Gloria Wang
Browse files

resolved conflicts for merge of c761a80d to master 

Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c
parents 6f3a75e1 c761a80d

drm/drmserver/DrmManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ status_t DrmManager::unloadPlugIns() { 


status_t DrmManager::setDrmServiceListener(

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

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mListenerLock);

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

        mServiceListeners.add(uniqueId, drmServiceListener);

    } else {
@@ -573,7 +573,7 @@ String8 DrmManager::getSupportedPlugInIdFromPath(int uniqueId, const String8& pa 
}



void DrmManager::onInfo(const DrmInfoEvent& event) {

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mListenerLock);

    for (unsigned int index = 0; index < mServiceListeners.size(); index++) {

        int uniqueId = mServiceListeners.keyAt(index);

drm/libdrmframework/DrmManagerClient.cpp

+0 −5
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ int DrmManagerClient::checkRightsStatus(const String8& path, int action) { 


status_t DrmManagerClient::consumeRights(

            sp<DecryptHandle> &decryptHandle, int action, bool reserve) {

    Mutex::Autolock _l(mDecryptLock);

    return mDrmManagerClientImpl->consumeRights(mUniqueId, decryptHandle, action, reserve);

}
@@ -132,7 +131,6 @@ status_t DrmManagerClient::closeDecryptSession(sp<DecryptHandle> &decryptHandle) 


status_t DrmManagerClient::initializeDecryptUnit(

            sp<DecryptHandle> &decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) {

    Mutex::Autolock _l(mDecryptLock);

    return mDrmManagerClientImpl->initializeDecryptUnit(

            mUniqueId, decryptHandle, decryptUnitId, headerInfo);

}
@@ -140,21 +138,18 @@ status_t DrmManagerClient::initializeDecryptUnit( 
status_t DrmManagerClient::decrypt(

            sp<DecryptHandle> &decryptHandle, int decryptUnitId,

            const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {

    Mutex::Autolock _l(mDecryptLock);

    return mDrmManagerClientImpl->decrypt(

            mUniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV);

}



status_t DrmManagerClient::finalizeDecryptUnit(

            sp<DecryptHandle> &decryptHandle, int decryptUnitId) {

    Mutex::Autolock _l(mDecryptLock);

    return mDrmManagerClientImpl->finalizeDecryptUnit(mUniqueId,

            decryptHandle, decryptUnitId);

}



ssize_t DrmManagerClient::pread(

            sp<DecryptHandle> &decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {

    Mutex::Autolock _l(mDecryptLock);

    return mDrmManagerClientImpl->pread(mUniqueId, decryptHandle, buffer, numBytes, offset);

}

drm/libdrmframework/include/DrmManager.h

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ private: 
    int mDecryptSessionId;

    int mConvertId;

    Mutex mLock;

    Mutex mListenerLock;

    Mutex mDecryptLock;

    Mutex mConvertLock;

    TPlugInManager<IDrmEngine> mPlugInManager;

include/drm/DrmManagerClient.h

+0 −1
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ public: 


private:

    int mUniqueId;

    Mutex mDecryptLock;

    DrmManagerClientImpl* mDrmManagerClientImpl;

};