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

-Fix some typo

Browse Source 
-Remove one unnecessary memory allocation

Change-Id: Icea21f33d2c7891333e06429d2f382389e5bd27f
This commit is contained in:
Gloria Wang
2011-06-15 10:27:52 -07:00
parent 6771263604
commit c10ce33302
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drm/common/IDrmManagerService.cpp
View File

@@ -37,7 +37,7 @@
using namespace android; using namespace android;
static void writeDecrptHandleToParcelData( static void writeDecryptHandleToParcelData(
const DecryptHandle* handle, Parcel* data) { const DecryptHandle* handle, Parcel* data) {
data->writeInt32(handle->decryptId); data->writeInt32(handle->decryptId);
data->writeString8(handle->mimeType); data->writeString8(handle->mimeType);
@@ -416,7 +416,7 @@ status_t BpDrmManagerService::consumeRights(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(action); data.writeInt32(action);
data.writeInt32(static_cast< int>(reserve)); data.writeInt32(static_cast< int>(reserve));
@@ -433,7 +433,7 @@ status_t BpDrmManagerService::setPlaybackStatus(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(playbackStatus); data.writeInt32(playbackStatus);
data.writeInt64(position); data.writeInt64(position);
@@ -646,7 +646,7 @@ status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* d
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
remote()->transact(CLOSE_DECRYPT_SESSION, data, &reply); remote()->transact(CLOSE_DECRYPT_SESSION, data, &reply);
@@ -662,7 +662,7 @@ status_t BpDrmManagerService::initializeDecryptUnit(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(decryptUnitId); data.writeInt32(decryptUnitId);
@@ -682,7 +682,7 @@ status_t BpDrmManagerService::decrypt(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(decryptUnitId); data.writeInt32(decryptUnitId);
data.writeInt32((*decBuffer)->length); data.writeInt32((*decBuffer)->length);
@@ -715,7 +715,7 @@ status_t BpDrmManagerService::finalizeDecryptUnit(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(decryptUnitId); data.writeInt32(decryptUnitId);
@@ -733,7 +733,7 @@ ssize_t BpDrmManagerService::pread(
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor()); data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId); data.writeInt32(uniqueId);
writeDecrptHandleToParcelData(decryptHandle, &data); writeDecryptHandleToParcelData(decryptHandle, &data);
data.writeInt32(numBytes); data.writeInt32(numBytes);
data.writeInt64(offset); data.writeInt64(offset);
@@ -1244,7 +1244,7 @@ status_t BnDrmManagerService::onTransact(
= openDecryptSession(uniqueId, fd, data.readInt64(), data.readInt64()); = openDecryptSession(uniqueId, fd, data.readInt64(), data.readInt64());
if (NULL != handle) { if (NULL != handle) {
writeDecrptHandleToParcelData(handle, reply); writeDecryptHandleToParcelData(handle, reply);
clearDecryptHandle(handle); clearDecryptHandle(handle);
delete handle; handle = NULL; delete handle; handle = NULL;
} }
@@ -1262,7 +1262,7 @@ status_t BnDrmManagerService::onTransact(
DecryptHandle* handle = openDecryptSession(uniqueId, uri.string()); DecryptHandle* handle = openDecryptSession(uniqueId, uri.string());
if (NULL != handle) { if (NULL != handle) {
writeDecrptHandleToParcelData(handle, reply); writeDecryptHandleToParcelData(handle, reply);
clearDecryptHandle(handle); clearDecryptHandle(handle);
delete handle; handle = NULL; delete handle; handle = NULL;

4
drm/libdrmframework/include/PlugInManager.h
View File

@@ -202,7 +202,7 @@ private:
Vector<String8> getPlugInPathList(const String8& rsDirPath) { Vector<String8> getPlugInPathList(const String8& rsDirPath) {
Vector<String8> fileList; Vector<String8> fileList;
DIR* pDir = opendir(rsDirPath.string()); DIR* pDir = opendir(rsDirPath.string());
struct dirent* pEntry = new dirent(); struct dirent* pEntry;
while (NULL != pDir && NULL != (pEntry = readdir(pDir))) { while (NULL != pDir && NULL != (pEntry = readdir(pDir))) {
if (!isPlugIn(pEntry)) { if (!isPlugIn(pEntry)) {
@@ -219,8 +219,6 @@ private:
if (NULL != pDir) { if (NULL != pDir) {
closedir(pDir); closedir(pDir);
} }
delete pEntry;
pEntry = NULL;
return fileList; return fileList;
} }