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

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

Snap for 7124858 from 515608f3 to rvc-qpr3-release 

Change-Id: I1f9b5d7021de04696074b40ef904b95ef99aa406
parents e4a2a3a8 515608f3

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

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



void DrmPlugin::setPlayPolicy() {

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

    mPlayPolicy.clear();

    mPlayPolicy.add(kQueryKeyLicenseType, kStreaming);

    mPlayPolicy.add(kQueryKeyPlayAllowed, kTrue);

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

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

    void setPlayPolicy();



    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/DrmPlugin.cpp

+1 −0
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ Return<void> DrmPlugin::getKeyRequest_1_2( 
}



void DrmPlugin::setPlayPolicy() {

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

    mPlayPolicy.clear();



    KeyValue policy;

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

+1 −0
Original line number Diff line number Diff line
@@ -406,6 +406,7 @@ private: 
    int64_t mCloseSessionOkCount;

    int64_t mCloseSessionNotOpenedCount;

    uint32_t mNextSecureStopId;

    android::Mutex mPlayPolicyLock;



    // set by property to mock error scenarios

    Status_V1_2 mMockError;