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

Commit e183d9f4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [14126781, 14126782, 14127202, 14128466, 14127516,... 

Merge cherrypicks of [14126781, 14126782, 14127202, 14128466, 14127516, 14128057, 14127204, 14128747, 14128708, 14128059, 14128686, 14128127, 14128507, 14128809, 14128810, 14128811, 14128812] into security-aosp-pi-release

Change-Id: Id0ac10a19c8eadc98092a7e6fab88c7cdd7e88df
parents e153e5bc 91324850

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

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ status_t DrmPlugin::queryKeyStatus( 
    }



    infoMap.clear();

    android::Mutex::Autolock lock(mPlayPolicyLock);

    for (size_t i = 0; i < mPlayPolicy.size(); ++i) {

        infoMap.add(mPlayPolicy.keyAt(i), mPlayPolicy.valueAt(i));

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ private: 
    void initProperties();

    void setPlayPolicy();



    android::Mutex mPlayPolicyLock;

    mutable android::Mutex mPlayPolicyLock;

    android::KeyedVector<String8, String8> mPlayPolicy;

    android::KeyedVector<String8, String8> mStringProperties;

    android::KeyedVector<String8, Vector<uint8_t>> mByteArrayProperties;

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

+5 −3
Original line number Diff line number Diff line
@@ -111,8 +111,10 @@ Return<void> CryptoPlugin::decrypt( 
    }



    base = static_cast<uint8_t *>(static_cast<void *>(destBase->getPointer()));



    if (destBuffer.offset + destBuffer.size > destBase->getSize()) {

    totalSize = 0;

    if (__builtin_add_overflow(destBuffer.offset, destBuffer.size, &totalSize) ||

        totalSize > destBase->getSize()) {

        android_errorWriteLog(0x534e4554, "176444622");

        _hidl_cb(Status::ERROR_DRM_CANNOT_HANDLE, 0, "invalid buffer size");

        return Void();

    }

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

+2 −1
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ Return<Status> DrmPlugin::setPropertyByteArray( 
Return<void> DrmPlugin::queryKeyStatus(

        const hidl_vec<uint8_t>& sessionId,

        queryKeyStatus_cb _hidl_cb) {



    if (sessionId.size() == 0) {

        // Returns empty key status KeyValue pair

        _hidl_cb(Status::BAD_VALUE, hidl_vec<KeyValue>());
@@ -349,12 +348,14 @@ Return<void> DrmPlugin::queryKeyStatus( 
    std::vector<KeyValue> infoMapVec;

    infoMapVec.clear();



    mPlayPolicyLock.lock();

    KeyValue keyValuePair;

    for (size_t i = 0; i < mPlayPolicy.size(); ++i) {

        keyValuePair.key = mPlayPolicy[i].key;

        keyValuePair.value = mPlayPolicy[i].value;

        infoMapVec.push_back(keyValuePair);

    }

    mPlayPolicyLock.unlock();

    _hidl_cb(Status::OK, toHidlVec(infoMapVec));

    return Void();

}