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

Commit cb85a295 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to... 

Merge "DO NOT MERGE Move legacy widevine classic global lock from framework to vendor/widevine implementation." into nyc-mr2-dev
parents c8ab1a8d 08dbccd2

media/libstagefright/WVMExtractor.cpp

+0 −6
Original line number Diff line number Diff line
@@ -42,13 +42,9 @@ void *gVendorLibHandle = NULL; 


namespace android {



static Mutex gWVMutex;



WVMExtractor::WVMExtractor(const sp<DataSource> &source)

    : mDataSource(source)

{

    Mutex::Autolock autoLock(gWVMutex);



    if (!getVendorLibHandle()) {

        return;

    }
@@ -169,8 +165,6 @@ bool SniffWVM( 
    const sp<DataSource> &source, String8 *mimeType, float *confidence,

        sp<AMessage> *) {



    Mutex::Autolock autoLock(gWVMutex);



    if (!WVMExtractor::getVendorLibHandle()) {

        return false;

    }