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

Commit 9a150640 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Let getOriginalMimeType() take a fd passed from drm java applications" into jb-mr1-dev

parents 0c676cd0 bf5b3b29

drm/common/DrmEngineBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -66,8 +66,8 @@ DrmInfo* DrmEngineBase::acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmIn 
    return onAcquireDrmInfo(uniqueId, drmInfoRequest);

}



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

    return onGetOriginalMimeType(uniqueId, path);

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

    return onGetOriginalMimeType(uniqueId, path, fd);

}



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

drm/common/IDrmManagerService.cpp

+12 −2
Original line number Diff line number Diff line
@@ -368,13 +368,18 @@ status_t BpDrmManagerService::saveRights( 
    return reply.readInt32();

}



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

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

    ALOGV("Get Original MimeType");

    Parcel data, reply;



    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);

    data.writeString8(path);

    int32_t isFdValid = (fd >= 0);

    data.writeInt32(isFdValid);

    if (isFdValid) {

        data.writeFileDescriptor(fd);

    }



    remote()->transact(GET_ORIGINAL_MIMETYPE, data, &reply);

    return reply.readString8();
@@ -1067,7 +1072,12 @@ status_t BnDrmManagerService::onTransact( 


        const int uniqueId = data.readInt32();

        const String8 path = data.readString8();

        const String8 originalMimeType = getOriginalMimeType(uniqueId, path);

        const int32_t isFdValid = data.readInt32();

        int fd = -1;

        if (isFdValid) {

            fd = data.readFileDescriptor();

        }

        const String8 originalMimeType = getOriginalMimeType(uniqueId, path, fd);



        reply->writeString8(originalMimeType);

        return DRM_NO_ERROR;

drm/drmserver/DrmManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -266,12 +266,12 @@ status_t DrmManager::saveRights(int uniqueId, const DrmRights& drmRights, 
    return result;

}



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

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

    Mutex::Autolock _l(mLock);

    const String8 plugInId = getSupportedPlugInIdFromPath(uniqueId, path);

    if (EMPTY_STRING != plugInId) {

        IDrmEngine& rDrmEngine = mPlugInManager.getPlugIn(plugInId);

        return rDrmEngine.getOriginalMimeType(uniqueId, path);

        return rDrmEngine.getOriginalMimeType(uniqueId, path, fd);

    }

    return EMPTY_STRING;

}

drm/drmserver/DrmManagerService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ status_t DrmManagerService::saveRights( 
    return mDrmManager->saveRights(uniqueId, drmRights, rightsPath, contentPath);

}



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

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

    ALOGV("Entering getOriginalMimeType");

    return mDrmManager->getOriginalMimeType(uniqueId, path);

    return mDrmManager->getOriginalMimeType(uniqueId, path, fd);

}



int DrmManagerService::getDrmObjectType(

drm/libdrmframework/DrmManagerClient.cpp

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ status_t DrmManagerClient::saveRights( 
    return mDrmManagerClientImpl->saveRights(mUniqueId, drmRights, rightsPath, contentPath);

}



String8 DrmManagerClient::getOriginalMimeType(const String8& path) {

    return mDrmManagerClientImpl->getOriginalMimeType(mUniqueId, path);

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

    return mDrmManagerClientImpl->getOriginalMimeType(mUniqueId, path, fd);

}



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