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

Commit 17bfa455 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE - Merge QQ2A.200405.005 into master"

parents dd1fafd8 4da6b39d

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

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ Return<void> CryptoPlugin::decrypt_1_2( 
        return Void();

    }



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



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

        _hidl_cb(Status_V1_2::ERROR_DRM_FRAME_TOO_LARGE, 0, "invalid buffer size");

        return Void();

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

+5 −0
Original line number Diff line number Diff line
@@ -809,6 +809,11 @@ Return<Status> DrmPlugin::releaseSecureStops(const SecureStopRelease& ssRelease) 
    //    count - number of secure stops

    //    list of fixed length secure stops

    size_t countBufferSize = sizeof(uint32_t);

    if (input.size() < countBufferSize) {

        // SafetyNet logging

        android_errorWriteLog(0x534e4554, "144766455");

        return Status::BAD_VALUE;

    }

    uint32_t count = 0;

    sscanf(reinterpret_cast<char*>(input.data()), "%04" PRIu32, &count);

services/audiopolicy/managerdefault/AudioPolicyManager.h

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ protected: 
        }

        virtual const DeviceVector getAvailableOutputDevices() const

        {

            return mAvailableOutputDevices;

            return mAvailableOutputDevices.filterForEngine();

        }

        virtual const DeviceVector getAvailableInputDevices() const

        {