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

Commit 22192eaa authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the... 

Merge "- Add two sanity checks. - Remove one unnecessary line. - Clear the extendedData vector in DecryptHandle."
parents 68cbeba4 ab00df4d

drm/common/DrmSupportInfo.cpp

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ bool DrmSupportInfo::operator==(const DrmSupportInfo& drmSupportInfo) const { 
}



bool DrmSupportInfo::isSupportedMimeType(const String8& mimeType) const {

    if (String8("") == mimeType) {

        return false;

    }



    for (unsigned int i = 0; i < mMimeTypeVector.size(); i++) {

        const String8 item = mMimeTypeVector.itemAt(i);

drm/common/IDrmManagerService.cpp

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ static void clearDecryptHandle(DecryptHandle* handle) { 
        handle->decryptInfo = NULL;

    }

    handle->copyControlVector.clear();

    handle->extendedData.clear();

}



int BpDrmManagerService::addUniqueId(int uniqueId) {

drm/libdrmframework/DrmManagerClientImpl.cpp

+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ DrmInfo* DrmManagerClientImpl::acquireDrmInfo( 


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

            const String8& rightsPath, const String8& contentPath) {

    status_t status = DRM_ERROR_UNKNOWN;

    return getDrmManagerService()->saveRights(

                uniqueId, drmRights, rightsPath, contentPath);

}