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

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

Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1

parents 453c0d5f c430394e

drm/common/IDrmManagerService.cpp

+17 −2
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ static void writeDecrptHandleToParcelData( 
        data->writeInt32(handle->copyControlVector.valueAt(i));

    }



    size = handle->extendedData.size();

    data->writeInt32(size);

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

        data->writeString8(handle->extendedData.keyAt(i));

        data->writeString8(handle->extendedData.valueAt(i));

    }



    if (NULL != handle->decryptInfo) {

        data->writeInt32(handle->decryptInfo->decryptBufferLength);

    } else {
@@ -71,8 +78,16 @@ static void readDecryptHandleFromParcelData( 


    int size = data.readInt32();

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

        handle->copyControlVector.add(

                (DrmCopyControl)data.readInt32(), data.readInt32());

        DrmCopyControl key = (DrmCopyControl)data.readInt32();

        int value = data.readInt32();

        handle->copyControlVector.add(key, value);

    }



    size = data.readInt32();

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

        String8 key = data.readString8();

        String8 value = data.readString8();

        handle->extendedData.add(key, value);

    }



    handle->decryptInfo = NULL;

include/drm/drm_framework_common.h

+6 −0
Original line number Diff line number Diff line
@@ -296,6 +296,12 @@ public: 
     */

    KeyedVector<DrmCopyControl, int> copyControlVector;



    /**

     * Defines a vector for any extra data the DRM plugin wants to send

     * to the native code

     */

    KeyedVector<String8, String8> extendedData;



public:

    DecryptHandle():

            decryptId(INVALID_VALUE),