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

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

Merge "-Fix some typo -Remove one unnecessary memory allocation"

parents 01bded12 c10ce333

drm/common/IDrmManagerService.cpp

+14 −14
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


using namespace android;



static void writeDecrptHandleToParcelData(

static void writeDecryptHandleToParcelData(

        const DecryptHandle* handle, Parcel* data) {

    data->writeInt32(handle->decryptId);

    data->writeString8(handle->mimeType);
@@ -416,7 +416,7 @@ status_t BpDrmManagerService::consumeRights( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(action);

    data.writeInt32(static_cast< int>(reserve));
@@ -433,7 +433,7 @@ status_t BpDrmManagerService::setPlaybackStatus( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(playbackStatus);

    data.writeInt64(position);
@@ -646,7 +646,7 @@ status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* d 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    remote()->transact(CLOSE_DECRYPT_SESSION, data, &reply);
@@ -662,7 +662,7 @@ status_t BpDrmManagerService::initializeDecryptUnit( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(decryptUnitId);
@@ -682,7 +682,7 @@ status_t BpDrmManagerService::decrypt( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(decryptUnitId);

    data.writeInt32((*decBuffer)->length);
@@ -715,7 +715,7 @@ status_t BpDrmManagerService::finalizeDecryptUnit( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(decryptUnitId);
@@ -733,7 +733,7 @@ ssize_t BpDrmManagerService::pread( 
    data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());

    data.writeInt32(uniqueId);



    writeDecrptHandleToParcelData(decryptHandle, &data);

    writeDecryptHandleToParcelData(decryptHandle, &data);



    data.writeInt32(numBytes);

    data.writeInt64(offset);
@@ -1244,7 +1244,7 @@ status_t BnDrmManagerService::onTransact( 
            = openDecryptSession(uniqueId, fd, data.readInt64(), data.readInt64());



        if (NULL != handle) {

            writeDecrptHandleToParcelData(handle, reply);

            writeDecryptHandleToParcelData(handle, reply);

            clearDecryptHandle(handle);

            delete handle; handle = NULL;

        }
@@ -1262,7 +1262,7 @@ status_t BnDrmManagerService::onTransact( 
        DecryptHandle* handle = openDecryptSession(uniqueId, uri.string());



        if (NULL != handle) {

            writeDecrptHandleToParcelData(handle, reply);

            writeDecryptHandleToParcelData(handle, reply);



            clearDecryptHandle(handle);

            delete handle; handle = NULL;

drm/libdrmframework/include/PlugInManager.h

+1 −3
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ private: 
    Vector<String8> getPlugInPathList(const String8& rsDirPath) {

        Vector<String8> fileList;

        DIR* pDir = opendir(rsDirPath.string());

        struct dirent* pEntry = new dirent();

        struct dirent* pEntry;



        while (NULL != pDir && NULL != (pEntry = readdir(pDir))) {

            if (!isPlugIn(pEntry)) {
@@ -219,8 +219,6 @@ private: 
        if (NULL != pDir) {

            closedir(pDir);

        }

        delete pEntry;

        pEntry = NULL;



        return fileList;

    }