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

Commit 660fa800 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19536772] into security-aosp-rvc-release. 

Change-Id: I1ed2fb841700fe62db2730ab335c6f79acd0fbaa
parents ef06c6ab e19d70f7

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ Return<void> DrmPlugin::getSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Void();

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr == mSecurityLevel.end()) {
@@ -653,6 +654,7 @@ Return<Status> DrmPlugin::setSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Status::ERROR_DRM_SESSION_NOT_OPENED;

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr != mSecurityLevel.end()) {

drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h

+3 −1
Original line number Diff line number Diff line
@@ -398,7 +398,8 @@ private: 
    std::map<std::string, std::string> mStringProperties;

    std::map<std::string, std::vector<uint8_t> > mByteArrayProperties;

    std::map<std::string, std::vector<uint8_t> > mReleaseKeysMap;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel

        GUARDED_BY(mSecurityLevelLock);

    sp<IDrmPluginListener> mListener;

    sp<IDrmPluginListener_V1_2> mListenerV1_2;

    SessionLibrary *mSessionLibrary;
@@ -419,6 +420,7 @@ private: 
    DeviceFiles mFileHandle GUARDED_BY(mFileHandleLock);

    Mutex mFileHandleLock;

    Mutex mSecureStopLock;

    Mutex mSecurityLevelLock;



    CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin);

};