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

Commit c52ca479 authored by Aurimas Liutikas's avatar Aurimas Liutikas
Browse files

Suppress unused parameter warnings in libdrmframework. 

This change also enables -Werror flag that causes
all warning to fail this target's build to prevent regressions.

Bug: 27151704
Change-Id: I5d815d20aea151eb40292b8e2bffb144240413a2
parent 661c5953

drm/libdrmframework/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ LOCAL_C_INCLUDES += \ 
    $(TOP)/frameworks/av/drm/libdrmframework/include \

    $(TOP)/frameworks/av/include



LOCAL_CFLAGS += -Werror





LOCAL_MODULE_TAGS := optional

drm/libdrmframework/DrmManagerClientImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -350,7 +350,8 @@ DrmManagerClientImpl::DeathNotifier::~DeathNotifier() { 
    }

}



void DrmManagerClientImpl::DeathNotifier::binderDied(const wp<IBinder>& who) {

void DrmManagerClientImpl::DeathNotifier::binderDied(

            const wp<IBinder>& /* who */) {

    Mutex::Autolock lock(sMutex);

    DrmManagerClientImpl::sDrmManagerService.clear();

    ALOGW("DrmManager server died!");

drm/libdrmframework/NoOpDrmManagerClientImpl.cpp

+111 −36
Original line number Diff line number Diff line
@@ -18,134 +18,209 @@ 


namespace android {



void NoOpDrmManagerClientImpl::remove(int uniqueId) {

void NoOpDrmManagerClientImpl::remove(int /* uniqueId */) {

}



void NoOpDrmManagerClientImpl::addClient(int uniqueId) {

void NoOpDrmManagerClientImpl::addClient(int /* uniqueId */) {

}



void NoOpDrmManagerClientImpl::removeClient(int uniqueId) {

void NoOpDrmManagerClientImpl::removeClient(

            int /* uniqueId */) {

}



status_t NoOpDrmManagerClientImpl::setOnInfoListener(

            int uniqueId, const sp<DrmManagerClient::OnInfoListener>& infoListener) {

            int /* uniqueId */,

            const sp<DrmManagerClient::OnInfoListener>& /* infoListener */) {

    return UNKNOWN_ERROR;

}



DrmConstraints* NoOpDrmManagerClientImpl::getConstraints(int uniqueId, const String8* path, const int action) {

DrmConstraints* NoOpDrmManagerClientImpl::getConstraints(

            int /* uniqueId */,

            const String8* /* path */,

            const int /* action */) {

    return NULL;

}



DrmMetadata* NoOpDrmManagerClientImpl::getMetadata(int uniqueId, const String8* path) {

DrmMetadata* NoOpDrmManagerClientImpl::getMetadata(

            int /* uniqueId */,

            const String8* /* path */) {

    return NULL;

}



bool NoOpDrmManagerClientImpl::canHandle(int uniqueId, const String8& path, const String8& mimeType) {

bool NoOpDrmManagerClientImpl::canHandle(

            int /* uniqueId */,

            const String8& /* path */,

            const String8& /* mimeType */) {

    return false;

}



DrmInfoStatus* NoOpDrmManagerClientImpl::processDrmInfo(int uniqueId, const DrmInfo* drmInfo) {

DrmInfoStatus* NoOpDrmManagerClientImpl::processDrmInfo(

            int /* uniqueId */,

            const DrmInfo* /* drmInfo */) {

    return NULL;

}



DrmInfo* NoOpDrmManagerClientImpl::acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) {

DrmInfo* NoOpDrmManagerClientImpl::acquireDrmInfo(

            int /* uniqueId */,

            const DrmInfoRequest* /* drmInfoRequest */) {

    return NULL;

}



status_t NoOpDrmManagerClientImpl::saveRights(int uniqueId, const DrmRights& drmRights,

            const String8& rightsPath, const String8& contentPath) {

status_t NoOpDrmManagerClientImpl::saveRights(

            int /* uniqueId */,

            const DrmRights& /* drmRights */,

            const String8& /* rightsPath */,

            const String8& /* contentPath */) {

    return UNKNOWN_ERROR;

}



String8 NoOpDrmManagerClientImpl::getOriginalMimeType(int uniqueId, const String8& path, int fd) {

String8 NoOpDrmManagerClientImpl::getOriginalMimeType(

            int /* uniqueId */,

            const String8& /* path */,

            int /* fd */) {

    return String8();

}



int NoOpDrmManagerClientImpl::getDrmObjectType(int uniqueId, const String8& path, const String8& mimeType) {

int NoOpDrmManagerClientImpl::getDrmObjectType(

            int /* uniqueId */,

            const String8& /* path */,

            const String8& /* mimeType */) {

    return -1;

}



int NoOpDrmManagerClientImpl::checkRightsStatus(int uniqueId, const String8& path, int action) {

int NoOpDrmManagerClientImpl::checkRightsStatus(

            int /* uniqueId */,

            const String8& /* path */,

            int /* action */) {

    return -1;

}



status_t NoOpDrmManagerClientImpl::consumeRights(int uniqueId, sp<DecryptHandle> &decryptHandle, int action, bool reserve) {

status_t NoOpDrmManagerClientImpl::consumeRights(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            int /* action */,

            bool /* reserve */) {

    return UNKNOWN_ERROR;

}



status_t NoOpDrmManagerClientImpl::setPlaybackStatus(

            int uniqueId, sp<DecryptHandle> &decryptHandle, int playbackStatus, int64_t position) {

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            int /* playbackStatus */,

            int64_t /* position */) {

    return UNKNOWN_ERROR;

}



bool NoOpDrmManagerClientImpl::validateAction(

        int uniqueId, const String8& path, int action, const ActionDescription& description) {

            int /* uniqueId */,

            const String8& /* path */,

            int /* action */,

            const ActionDescription& /* description */) {

    return false;

}



status_t NoOpDrmManagerClientImpl::removeRights(int uniqueId, const String8& path) {

status_t NoOpDrmManagerClientImpl::removeRights(

            int /* uniqueId */,

            const String8& /* path */) {

    return UNKNOWN_ERROR;

}



status_t NoOpDrmManagerClientImpl::removeAllRights(int uniqueId) {

status_t NoOpDrmManagerClientImpl::removeAllRights(

            int /* uniqueId */) {

    return UNKNOWN_ERROR;

}



int NoOpDrmManagerClientImpl::openConvertSession(int uniqueId, const String8& mimeType) {

int NoOpDrmManagerClientImpl::openConvertSession(

            int /* uniqueId */,

            const String8& /* mimeType */) {

    return -1;

}



DrmConvertedStatus* NoOpDrmManagerClientImpl::convertData(int uniqueId, int convertId, const DrmBuffer* inputData) {

DrmConvertedStatus* NoOpDrmManagerClientImpl::convertData(

            int /* uniqueId */,

            int /* convertId */,

            const DrmBuffer* /* inputData */) {

    return NULL;

}



DrmConvertedStatus* NoOpDrmManagerClientImpl::closeConvertSession(int uniqueId, int convertId) {

DrmConvertedStatus* NoOpDrmManagerClientImpl::closeConvertSession(

            int /* uniqueId */,

            int /* convertId */) {

    return NULL;

}



status_t NoOpDrmManagerClientImpl::getAllSupportInfo(int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) {

status_t NoOpDrmManagerClientImpl::getAllSupportInfo(

            int /* uniqueId */,

            int* /* length */,

            DrmSupportInfo** /* drmSupportInfoArray */) {

    return UNKNOWN_ERROR;

}



sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

            int uniqueId, int fd, off64_t offset, off64_t length, const char* mime) {

            int /* uniqueId */,

            int /* fd */,

            off64_t /* offset */,

            off64_t /* length */,

            const char* /* mime */) {

    return NULL;

}



sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

            int uniqueId, const char* uri, const char* mime) {

            int /* uniqueId */,

            const char* /* uri */,

            const char* /* mime */) {

    return NULL;

}



sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(int uniqueId, const DrmBuffer& buf,

            const String8& mimeType) {

sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

            int /* uniqueId */,

            const DrmBuffer& /* buf */,

            const String8& /* mimeType */) {

    return NULL;

}



status_t NoOpDrmManagerClientImpl::closeDecryptSession(int uniqueId, sp<DecryptHandle> &decryptHandle) {

status_t NoOpDrmManagerClientImpl::closeDecryptSession(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */) {

    return UNKNOWN_ERROR;

}



status_t NoOpDrmManagerClientImpl::initializeDecryptUnit(int uniqueId, sp<DecryptHandle> &decryptHandle,

            int decryptUnitId, const DrmBuffer* headerInfo) {

status_t NoOpDrmManagerClientImpl::initializeDecryptUnit(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            int /* decryptUnitId */,

            const DrmBuffer* /* headerInfo */) {

    return UNKNOWN_ERROR;

}



status_t NoOpDrmManagerClientImpl::decrypt(int uniqueId, sp<DecryptHandle> &decryptHandle, int decryptUnitId,

            const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {

status_t NoOpDrmManagerClientImpl::decrypt(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            int /* decryptUnitId */,

            const DrmBuffer* /* encBuffer */,

            DrmBuffer** /* decBuffer */,

            DrmBuffer* /* IV */) {

    return UNKNOWN_ERROR;

}



status_t NoOpDrmManagerClientImpl::finalizeDecryptUnit(int uniqueId, sp<DecryptHandle> &decryptHandle, int decryptUnitId) {

status_t NoOpDrmManagerClientImpl::finalizeDecryptUnit(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            int /* decryptUnitId */) {

    return UNKNOWN_ERROR;

}



ssize_t NoOpDrmManagerClientImpl::pread(int uniqueId, sp<DecryptHandle> &decryptHandle,

            void* buffer, ssize_t numBytes, off64_t offset) {

ssize_t NoOpDrmManagerClientImpl::pread(

            int /* uniqueId */,

            sp<DecryptHandle> &/* decryptHandle */,

            void* /* buffer */,

            ssize_t /* numBytes */,

            off64_t /* offset */) {

    return -1;

}



status_t NoOpDrmManagerClientImpl::notify(const DrmInfoEvent& event) {

status_t NoOpDrmManagerClientImpl::notify(

            const DrmInfoEvent& /* event */) {

    return UNKNOWN_ERROR;

}