LineageOS/android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of a8d7b747 to master

Browse Source 
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
This commit is contained in:
Gloria Wang
2010-11-03 11:39:04 -07:00
parent bf3122eed3 3041096d13
commit b251f75d5c
18 changed files with 275 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
drm/common/IDrmManagerService.cpp
View File

@@ -53,27 +53,18 @@ void BpDrmManagerService::removeUniqueId(int uniqueId) {
remote()->transact(REMOVE_UNIQUEID, data, &reply);
}
status_t BpDrmManagerService::loadPlugIns(int uniqueId) {
LOGV("load plugins");
void BpDrmManagerService::addClient(int uniqueId) {
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
remote()->transact(LOAD_PLUGINS, data, &reply);
return reply.readInt32();
remote()->transact(ADD_CLIENT, data, &reply);
}
status_t BpDrmManagerService::loadPlugIns(int uniqueId, const String8& plugInDirPath) {
LOGV("load plugins from path");
void BpDrmManagerService::removeClient(int uniqueId) {
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
data.writeString8(plugInDirPath);
remote()->transact(LOAD_PLUGINS_FROM_PATH, data, &reply);
return reply.readInt32();
remote()->transact(REMOVE_CLIENT, data, &reply);
}
status_t BpDrmManagerService::setDrmServiceListener(
@@ -88,17 +79,6 @@ status_t BpDrmManagerService::setDrmServiceListener(
return reply.readInt32();
}
status_t BpDrmManagerService::unloadPlugIns(int uniqueId) {
LOGV("unload plugins");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
remote()->transact(UNLOAD_PLUGINS, data, &reply);
return reply.readInt32();
}
status_t BpDrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
LOGV("Install DRM Engine");
Parcel data, reply;
@@ -191,6 +171,7 @@ DrmInfoStatus* BpDrmManagerService::processDrmInfo(int uniqueId, const DrmInfo*
if (0 != reply.dataAvail()) {
//Filling DRM Info Status
const int statusCode = reply.readInt32();
const int infoType = reply.readInt32();
const String8 mimeType = reply.readString8();
DrmBuffer* drmBuffer = NULL;
@@ -203,7 +184,7 @@ DrmInfoStatus* BpDrmManagerService::processDrmInfo(int uniqueId, const DrmInfo*
}
drmBuffer = new DrmBuffer(data, bufferSize);
}
drmInfoStatus = new DrmInfoStatus(statusCode, drmBuffer, mimeType);
drmInfoStatus = new DrmInfoStatus(statusCode, infoType, drmBuffer, mimeType);
}
return drmInfoStatus;
}
@@ -538,8 +519,7 @@ DecryptHandle* BpDrmManagerService::openDecryptSession(
LOGV("Entering BpDrmManagerService::openDecryptSession");
Parcel data, reply;
const String16 interfaceDescriptor = IDrmManagerService::getInterfaceDescriptor();
data.writeInterfaceToken(interfaceDescriptor);
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
data.writeFileDescriptor(fd);
data.writeInt32(offset);
@@ -563,6 +543,34 @@ DecryptHandle* BpDrmManagerService::openDecryptSession(
return handle;
}
DecryptHandle* BpDrmManagerService::openDecryptSession(int uniqueId, const char* uri) {
LOGV("Entering BpDrmManagerService::openDecryptSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
data.writeString8(String8(uri));
remote()->transact(OPEN_DECRYPT_SESSION_FROM_URI, data, &reply);
DecryptHandle* handle = NULL;
if (0 != reply.dataAvail()) {
handle = new DecryptHandle();
handle->decryptId = reply.readInt32();
handle->mimeType = reply.readString8();
handle->decryptApiType = reply.readInt32();
handle->status = reply.readInt32();
handle->decryptInfo = NULL;
if (0 != reply.dataAvail()) {
handle->decryptInfo = new DecryptInfo();
handle->decryptInfo->decryptBufferLength = reply.readInt32();
}
} else {
LOGE("no decryptHandle is generated in service side");
}
return handle;
}
status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
LOGV("closeDecryptSession");
Parcel data, reply;
@@ -744,25 +752,19 @@ status_t BnDrmManagerService::onTransact(
return DRM_NO_ERROR;
}
case LOAD_PLUGINS:
case ADD_CLIENT:
{
LOGV("BnDrmManagerService::onTransact :LOAD_PLUGINS");
LOGV("BnDrmManagerService::onTransact :ADD_CLIENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
status_t status = loadPlugIns(data.readInt32());
reply->writeInt32(status);
addClient(data.readInt32());
return DRM_NO_ERROR;
}
case LOAD_PLUGINS_FROM_PATH:
case REMOVE_CLIENT:
{
LOGV("BnDrmManagerService::onTransact :LOAD_PLUGINS_FROM_PATH");
LOGV("BnDrmManagerService::onTransact :REMOVE_CLIENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
status_t status = loadPlugIns(data.readInt32(), data.readString8());
reply->writeInt32(status);
removeClient(data.readInt32());
return DRM_NO_ERROR;
}
@@ -781,18 +783,6 @@ status_t BnDrmManagerService::onTransact(
return DRM_NO_ERROR;
}
case UNLOAD_PLUGINS:
{
LOGV("BnDrmManagerService::onTransact :UNLOAD_PLUGINS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
status_t status = unloadPlugIns(uniqueId);
reply->writeInt32(status);
return DRM_NO_ERROR;
}
case INSTALL_DRM_ENGINE:
{
LOGV("BnDrmManagerService::onTransact :INSTALL_DRM_ENGINE");
@@ -879,6 +869,7 @@ status_t BnDrmManagerService::onTransact(
if (NULL != drmInfoStatus) {
//Filling DRM Info Status contents
reply->writeInt32(drmInfoStatus->statusCode);
reply->writeInt32(drmInfoStatus->infoType);
reply->writeString8(drmInfoStatus->mimeType);
if (NULL != drmInfoStatus->drmBuffer) {
@@ -1235,6 +1226,32 @@ status_t BnDrmManagerService::onTransact(
return DRM_NO_ERROR;
}
case OPEN_DECRYPT_SESSION_FROM_URI:
{
LOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION_FROM_URI");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
const String8 uri = data.readString8();
DecryptHandle* handle = openDecryptSession(uniqueId, uri.string());
if (NULL != handle) {
reply->writeInt32(handle->decryptId);
reply->writeString8(handle->mimeType);
reply->writeInt32(handle->decryptApiType);
reply->writeInt32(handle->status);
if (NULL != handle->decryptInfo) {
reply->writeInt32(handle->decryptInfo->decryptBufferLength);
delete handle->decryptInfo; handle->decryptInfo = NULL;
}
} else {
LOGE("NULL decryptHandle is returned");
}
delete handle; handle = NULL;
return DRM_NO_ERROR;
}
case CLOSE_DECRYPT_SESSION:
{
LOGV("BnDrmManagerService::onTransact :CLOSE_DECRYPT_SESSION");