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

Commit 5a8dbe7a authored by Mark Salyzyn's avatar Mark Salyzyn
Browse files

drm: unused argument warning messages 

Change-Id: Ifd8a470ffa02f986427c5f36380d70494efe864d
parent a9292e06

drm/drmserver/DrmManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -370,7 +370,7 @@ DrmConvertedStatus* DrmManager::closeConvertSession(int uniqueId, int convertId) 
}

}





status_t DrmManager::getAllSupportInfo(

status_t DrmManager::getAllSupportInfo(

                    int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) {

                    int /*uniqueId*/, int* length, DrmSupportInfo** drmSupportInfoArray) {

    Mutex::Autolock _l(mLock);

    Mutex::Autolock _l(mLock);

    Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();

    Vector<String8> plugInPathList = mPlugInManager.getPlugInIdList();

    int size = plugInPathList.size();

    int size = plugInPathList.size();

drm/drmserver/main_drmserver.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 




using namespace android;

using namespace android;





int main(int argc, char** argv)

int main(int, char**)

{

{

    sp<ProcessState> proc(ProcessState::self());

    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm = defaultServiceManager();

    sp<IServiceManager> sm = defaultServiceManager();

drm/libdrmframework/DrmManagerClientImpl.cpp

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

    }

}

}





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

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

    Mutex::Autolock lock(sMutex);

    Mutex::Autolock lock(sMutex);

    DrmManagerClientImpl::sDrmManagerService.clear();

    DrmManagerClientImpl::sDrmManagerService.clear();

    ALOGW("DrmManager server died!");

    ALOGW("DrmManager server died!");

drm/libdrmframework/NoOpDrmManagerClientImpl.cpp

+63 −37
Original line number Original line Diff line number Diff line
@@ -18,134 +18,160 @@ 




namespace android {

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(

status_t NoOpDrmManagerClientImpl::setOnInfoListener(

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

            int /* uniqueId */,

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

    return UNKNOWN_ERROR;

    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;

    return NULL;

}

}





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

DrmMetadata* NoOpDrmManagerClientImpl::getMetadata(int /* uniqueId */,

            const String8* /* path */) {

    return NULL;

    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;

    return false;

}

}





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

DrmInfoStatus* NoOpDrmManagerClientImpl::processDrmInfo(int /* uniqueId */,

            const DrmInfo* /* drmInfo */) {

    return NULL;

    return NULL;

}

}





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

DrmInfo* NoOpDrmManagerClientImpl::acquireDrmInfo(int /* uniqueId */,

            const DrmInfoRequest* /* drmInfoRequest */) {

    return NULL;

    return NULL;

}

}





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

status_t NoOpDrmManagerClientImpl::saveRights(int /* uniqueId */,

            const String8& rightsPath, const String8& contentPath) {

            const DrmRights& /* drmRights */, const String8& /* rightsPath */,

            const String8& /* contentPath */) {

    return UNKNOWN_ERROR;

    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();

    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;

    return -1;

}

}





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

int NoOpDrmManagerClientImpl::checkRightsStatus(int /* uniqueId */,

            const String8& /* path */, int /* action */) {

    return -1;

    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;

    return UNKNOWN_ERROR;

}

}





status_t NoOpDrmManagerClientImpl::setPlaybackStatus(

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;

    return UNKNOWN_ERROR;

}

}





bool NoOpDrmManagerClientImpl::validateAction(

bool NoOpDrmManagerClientImpl::validateAction(int /* uniqueId */,

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

            const String8& /* path */, int /* action */,

            const ActionDescription& /* description */) {

    return false;

    return false;

}

}





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

status_t NoOpDrmManagerClientImpl::removeRights(int /* uniqueId */,

            const String8& /* path */) {

    return UNKNOWN_ERROR;

    return UNKNOWN_ERROR;

}

}





status_t NoOpDrmManagerClientImpl::removeAllRights(int uniqueId) {

status_t NoOpDrmManagerClientImpl::removeAllRights(int /* uniqueId */) {

    return UNKNOWN_ERROR;

    return UNKNOWN_ERROR;

}

}





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

int NoOpDrmManagerClientImpl::openConvertSession(int /* uniqueId */,

            const String8& /* mimeType */) {

    return -1;

    return -1;

}

}





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

DrmConvertedStatus* NoOpDrmManagerClientImpl::convertData(int /* uniqueId */,

            int /* convertId */, const DrmBuffer* /* inputData */) {

    return NULL;

    return NULL;

}

}





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

DrmConvertedStatus* NoOpDrmManagerClientImpl::closeConvertSession(

            int /* uniqueId */, int /* convertId */) {

    return NULL;

    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;

    return UNKNOWN_ERROR;

}

}





sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

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;

    return NULL;

}

}





sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(

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

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

    return NULL;

    return NULL;

}

}





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

sp<DecryptHandle> NoOpDrmManagerClientImpl::openDecryptSession(int /* uniqueId */,

            const String8& mimeType) {

            const DrmBuffer& /* buf */, const String8& /* mimeType */) {

    return NULL;

    return NULL;

}

}





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

status_t NoOpDrmManagerClientImpl::closeDecryptSession(int /* uniqueId */,

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

    return UNKNOWN_ERROR;

    return UNKNOWN_ERROR;

}

}





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

status_t NoOpDrmManagerClientImpl::initializeDecryptUnit(int /* uniqueId */,

            int decryptUnitId, const DrmBuffer* headerInfo) {

            sp<DecryptHandle>& /* decryptHandle */, int /* decryptUnitId */,

            const DrmBuffer* /* headerInfo */) {

    return UNKNOWN_ERROR;

    return UNKNOWN_ERROR;

}

}





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

status_t NoOpDrmManagerClientImpl::decrypt(int /* uniqueId */,

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

            sp<DecryptHandle>& /* decryptHandle */, int /* decryptUnitId */,

            const DrmBuffer* /* encBuffer */, DrmBuffer** /* decBuffer */,

            DrmBuffer* /* IV */) {

    return UNKNOWN_ERROR;

    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;

    return UNKNOWN_ERROR;

}

}





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

ssize_t NoOpDrmManagerClientImpl::pread(int /* uniqueId */,

            void* buffer, ssize_t numBytes, off64_t offset) {

            sp<DecryptHandle>& /* decryptHandle */,

            void* /* buffer */, ssize_t /* numBytes */, off64_t /* offset */) {

    return -1;

    return -1;

}

}





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

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

    return UNKNOWN_ERROR;

    return UNKNOWN_ERROR;

}

}

drm/libdrmframework/plugins/common/include/DrmEngineBase.h

+7 −7
Original line number Original line Diff line number Diff line
@@ -398,9 +398,9 @@ protected: 
     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     */

     */

    virtual status_t onOpenDecryptSession(

    virtual status_t onOpenDecryptSession(

            int uniqueId, DecryptHandle* decryptHandle,

            int /*uniqueId*/, DecryptHandle* /*decryptHandle*/,

            int fd, off64_t offset, off64_t length,

            int /*fd*/, off64_t /*offset*/, off64_t /*length*/,

            const char* mime) {

            const char* /*mime*/) {





        return DRM_ERROR_CANNOT_HANDLE;

        return DRM_ERROR_CANNOT_HANDLE;

    }

    }
@@ -430,8 +430,8 @@ protected: 
     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     */

     */

    virtual status_t onOpenDecryptSession(

    virtual status_t onOpenDecryptSession(

            int uniqueId, DecryptHandle* decryptHandle,

            int /*uniqueId*/, DecryptHandle* /*decryptHandle*/,

            const char* uri, const char* mime) {

            const char* /*uri*/, const char* /*mime*/) {





        return DRM_ERROR_CANNOT_HANDLE;

        return DRM_ERROR_CANNOT_HANDLE;

    }

    }
@@ -446,8 +446,8 @@ protected: 
     * @return

     * @return

     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     *     DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success

     */

     */

    virtual status_t onOpenDecryptSession(int uniqueId, DecryptHandle* decryptHandle,

    virtual status_t onOpenDecryptSession(int /*uniqueId*/, DecryptHandle* /*decryptHandle*/,

            const DrmBuffer& buf, const String8& mimeType) {

            const DrmBuffer& /*buf*/, const String8& /*mimeType*/) {

        return DRM_ERROR_CANNOT_HANDLE;

        return DRM_ERROR_CANNOT_HANDLE;

    }

    }