Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gloria Wang
2011-03-22 11:04:32 -07:00
committed by Android (Google) Code Review
parent 453c0d5f16 c430394ed7
commit 3cc797b9c4
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drm/common/IDrmManagerService.cpp
View File

@@ -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;

6
include/drm/drm_framework_common.h
View File

@@ -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),