Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
diff --git a/drm/common/DrmMetadata.cpp b/drm/common/DrmMetadata.cpp
index 6cc5ec1..2a4b8c8 100644
--- a/drm/common/DrmMetadata.cpp
+++ b/drm/common/DrmMetadata.cpp
@@ -78,11 +78,11 @@
DrmMetadata::KeyIterator::KeyIterator(const DrmMetadata::KeyIterator& keyIterator) :
mDrmMetadata(keyIterator.mDrmMetadata),
mIndex(keyIterator.mIndex) {
- LOGV("DrmMetadata::KeyIterator::KeyIterator");
+ ALOGV("DrmMetadata::KeyIterator::KeyIterator");
}
DrmMetadata::KeyIterator& DrmMetadata::KeyIterator::operator=(const DrmMetadata::KeyIterator& keyIterator) {
- LOGV("DrmMetadata::KeyIterator::operator=");
+ ALOGV("DrmMetadata::KeyIterator::operator=");
mDrmMetadata = keyIterator.mDrmMetadata;
mIndex = keyIterator.mIndex;
return *this;
@@ -96,11 +96,11 @@
DrmMetadata::Iterator::Iterator(const DrmMetadata::Iterator& iterator) :
mDrmMetadata(iterator.mDrmMetadata),
mIndex(iterator.mIndex) {
- LOGV("DrmMetadata::Iterator::Iterator");
+ ALOGV("DrmMetadata::Iterator::Iterator");
}
DrmMetadata::Iterator& DrmMetadata::Iterator::operator=(const DrmMetadata::Iterator& iterator) {
- LOGV("DrmMetadata::Iterator::operator=");
+ ALOGV("DrmMetadata::Iterator::operator=");
mDrmMetadata = iterator.mDrmMetadata;
mIndex = iterator.mIndex;
return *this;
diff --git a/drm/common/IDrmManagerService.cpp b/drm/common/IDrmManagerService.cpp
index 0b76a36..3ed8ade 100644
--- a/drm/common/IDrmManagerService.cpp
+++ b/drm/common/IDrmManagerService.cpp
@@ -111,7 +111,7 @@
}
int BpDrmManagerService::addUniqueId(bool isNative) {
- LOGV("add uniqueid");
+ ALOGV("add uniqueid");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(isNative);
@@ -120,7 +120,7 @@
}
void BpDrmManagerService::removeUniqueId(int uniqueId) {
- LOGV("remove uniqueid");
+ ALOGV("remove uniqueid");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
@@ -143,7 +143,7 @@
status_t BpDrmManagerService::setDrmServiceListener(
int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) {
- LOGV("setDrmServiceListener");
+ ALOGV("setDrmServiceListener");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -154,7 +154,7 @@
}
status_t BpDrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
- LOGV("Install DRM Engine");
+ ALOGV("Install DRM Engine");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -167,7 +167,7 @@
DrmConstraints* BpDrmManagerService::getConstraints(
int uniqueId, const String8* path, const int action) {
- LOGV("Get Constraints");
+ ALOGV("Get Constraints");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -198,7 +198,7 @@
}
DrmMetadata* BpDrmManagerService::getMetadata(int uniqueId, const String8* path) {
- LOGV("Get Metadata");
+ ALOGV("Get Metadata");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
@@ -227,7 +227,7 @@
}
bool BpDrmManagerService::canHandle(int uniqueId, const String8& path, const String8& mimeType) {
- LOGV("Can Handle");
+ ALOGV("Can Handle");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -242,7 +242,7 @@
}
DrmInfoStatus* BpDrmManagerService::processDrmInfo(int uniqueId, const DrmInfo* drmInfo) {
- LOGV("Process DRM Info");
+ ALOGV("Process DRM Info");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -293,7 +293,7 @@
}
DrmInfo* BpDrmManagerService::acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInforequest) {
- LOGV("Acquire DRM Info");
+ ALOGV("Acquire DRM Info");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -341,7 +341,7 @@
status_t BpDrmManagerService::saveRights(
int uniqueId, const DrmRights& drmRights,
const String8& rightsPath, const String8& contentPath) {
- LOGV("Save Rights");
+ ALOGV("Save Rights");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -369,7 +369,7 @@
}
String8 BpDrmManagerService::getOriginalMimeType(int uniqueId, const String8& path) {
- LOGV("Get Original MimeType");
+ ALOGV("Get Original MimeType");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -382,7 +382,7 @@
int BpDrmManagerService::getDrmObjectType(
int uniqueId, const String8& path, const String8& mimeType) {
- LOGV("Get Drm object type");
+ ALOGV("Get Drm object type");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -396,7 +396,7 @@
}
int BpDrmManagerService::checkRightsStatus(int uniqueId, const String8& path, int action) {
- LOGV("checkRightsStatus");
+ ALOGV("checkRightsStatus");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -411,7 +411,7 @@
status_t BpDrmManagerService::consumeRights(
int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve) {
- LOGV("consumeRights");
+ ALOGV("consumeRights");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -428,7 +428,7 @@
status_t BpDrmManagerService::setPlaybackStatus(
int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
- LOGV("setPlaybackStatus");
+ ALOGV("setPlaybackStatus");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -446,7 +446,7 @@
bool BpDrmManagerService::validateAction(
int uniqueId, const String8& path,
int action, const ActionDescription& description) {
- LOGV("validateAction");
+ ALOGV("validateAction");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -462,7 +462,7 @@
}
status_t BpDrmManagerService::removeRights(int uniqueId, const String8& path) {
- LOGV("removeRights");
+ ALOGV("removeRights");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -474,7 +474,7 @@
}
status_t BpDrmManagerService::removeAllRights(int uniqueId) {
- LOGV("removeAllRights");
+ ALOGV("removeAllRights");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -485,7 +485,7 @@
}
int BpDrmManagerService::openConvertSession(int uniqueId, const String8& mimeType) {
- LOGV("openConvertSession");
+ ALOGV("openConvertSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -498,7 +498,7 @@
DrmConvertedStatus* BpDrmManagerService::convertData(
int uniqueId, int convertId, const DrmBuffer* inputData) {
- LOGV("convertData");
+ ALOGV("convertData");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -532,7 +532,7 @@
}
DrmConvertedStatus* BpDrmManagerService::closeConvertSession(int uniqueId, int convertId) {
- LOGV("closeConvertSession");
+ ALOGV("closeConvertSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -565,7 +565,7 @@
status_t BpDrmManagerService::getAllSupportInfo(
int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) {
- LOGV("Get All Support Info");
+ ALOGV("Get All Support Info");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -601,7 +601,7 @@
DecryptHandle* BpDrmManagerService::openDecryptSession(
int uniqueId, int fd, off64_t offset, off64_t length) {
- LOGV("Entering BpDrmManagerService::openDecryptSession");
+ ALOGV("Entering BpDrmManagerService::openDecryptSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -621,7 +621,7 @@
}
DecryptHandle* BpDrmManagerService::openDecryptSession(int uniqueId, const char* uri) {
- LOGV("Entering BpDrmManagerService::openDecryptSession");
+ ALOGV("Entering BpDrmManagerService::openDecryptSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -635,13 +635,13 @@
handle = new DecryptHandle();
readDecryptHandleFromParcelData(handle, reply);
} else {
- LOGV("no decryptHandle is generated in service side");
+ ALOGV("no decryptHandle is generated in service side");
}
return handle;
}
status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
- LOGV("closeDecryptSession");
+ ALOGV("closeDecryptSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -657,7 +657,7 @@
status_t BpDrmManagerService::initializeDecryptUnit(
int uniqueId, DecryptHandle* decryptHandle,
int decryptUnitId, const DrmBuffer* headerInfo) {
- LOGV("initializeDecryptUnit");
+ ALOGV("initializeDecryptUnit");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -677,7 +677,7 @@
status_t BpDrmManagerService::decrypt(
int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId,
const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {
- LOGV("decrypt");
+ ALOGV("decrypt");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -699,7 +699,7 @@
remote()->transact(DECRYPT, data, &reply);
const status_t status = reply.readInt32();
- LOGV("Return value of decrypt() is %d", status);
+ ALOGV("Return value of decrypt() is %d", status);
const int size = reply.readInt32();
(*decBuffer)->length = size;
@@ -710,7 +710,7 @@
status_t BpDrmManagerService::finalizeDecryptUnit(
int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) {
- LOGV("finalizeDecryptUnit");
+ ALOGV("finalizeDecryptUnit");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
@@ -727,7 +727,7 @@
ssize_t BpDrmManagerService::pread(
int uniqueId, DecryptHandle* decryptHandle, void* buffer,
ssize_t numBytes, off64_t offset) {
- LOGV("read");
+ ALOGV("read");
Parcel data, reply;
int result;
@@ -752,12 +752,12 @@
status_t BnDrmManagerService::onTransact(
uint32_t code, const Parcel& data,
Parcel* reply, uint32_t flags) {
- LOGV("Entering BnDrmManagerService::onTransact with code %d", code);
+ ALOGV("Entering BnDrmManagerService::onTransact with code %d", code);
switch (code) {
case ADD_UNIQUEID:
{
- LOGV("BnDrmManagerService::onTransact :ADD_UNIQUEID");
+ ALOGV("BnDrmManagerService::onTransact :ADD_UNIQUEID");
CHECK_INTERFACE(IDrmManagerService, data, reply);
int uniqueId = addUniqueId(data.readInt32());
reply->writeInt32(uniqueId);
@@ -766,7 +766,7 @@
case REMOVE_UNIQUEID:
{
- LOGV("BnDrmManagerService::onTransact :REMOVE_UNIQUEID");
+ ALOGV("BnDrmManagerService::onTransact :REMOVE_UNIQUEID");
CHECK_INTERFACE(IDrmManagerService, data, reply);
removeUniqueId(data.readInt32());
return DRM_NO_ERROR;
@@ -774,7 +774,7 @@
case ADD_CLIENT:
{
- LOGV("BnDrmManagerService::onTransact :ADD_CLIENT");
+ ALOGV("BnDrmManagerService::onTransact :ADD_CLIENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
addClient(data.readInt32());
return DRM_NO_ERROR;
@@ -782,7 +782,7 @@
case REMOVE_CLIENT:
{
- LOGV("BnDrmManagerService::onTransact :REMOVE_CLIENT");
+ ALOGV("BnDrmManagerService::onTransact :REMOVE_CLIENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
removeClient(data.readInt32());
return DRM_NO_ERROR;
@@ -790,7 +790,7 @@
case SET_DRM_SERVICE_LISTENER:
{
- LOGV("BnDrmManagerService::onTransact :SET_DRM_SERVICE_LISTENER");
+ ALOGV("BnDrmManagerService::onTransact :SET_DRM_SERVICE_LISTENER");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -805,7 +805,7 @@
case INSTALL_DRM_ENGINE:
{
- LOGV("BnDrmManagerService::onTransact :INSTALL_DRM_ENGINE");
+ ALOGV("BnDrmManagerService::onTransact :INSTALL_DRM_ENGINE");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -818,7 +818,7 @@
case GET_CONSTRAINTS_FROM_CONTENT:
{
- LOGV("BnDrmManagerService::onTransact :GET_CONSTRAINTS_FROM_CONTENT");
+ ALOGV("BnDrmManagerService::onTransact :GET_CONSTRAINTS_FROM_CONTENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -850,7 +850,7 @@
case GET_METADATA_FROM_CONTENT:
{
- LOGV("BnDrmManagerService::onTransact :GET_METADATA_FROM_CONTENT");
+ ALOGV("BnDrmManagerService::onTransact :GET_METADATA_FROM_CONTENT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -882,7 +882,7 @@
case CAN_HANDLE:
{
- LOGV("BnDrmManagerService::onTransact :CAN_HANDLE");
+ ALOGV("BnDrmManagerService::onTransact :CAN_HANDLE");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -897,7 +897,7 @@
case PROCESS_DRM_INFO:
{
- LOGV("BnDrmManagerService::onTransact :PROCESS_DRM_INFO");
+ ALOGV("BnDrmManagerService::onTransact :PROCESS_DRM_INFO");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -945,7 +945,7 @@
case ACQUIRE_DRM_INFO:
{
- LOGV("BnDrmManagerService::onTransact :ACQUIRE_DRM_INFO");
+ ALOGV("BnDrmManagerService::onTransact :ACQUIRE_DRM_INFO");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -993,7 +993,7 @@
case SAVE_RIGHTS:
{
- LOGV("BnDrmManagerService::onTransact :SAVE_RIGHTS");
+ ALOGV("BnDrmManagerService::onTransact :SAVE_RIGHTS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1023,7 +1023,7 @@
case GET_ORIGINAL_MIMETYPE:
{
- LOGV("BnDrmManagerService::onTransact :GET_ORIGINAL_MIMETYPE");
+ ALOGV("BnDrmManagerService::onTransact :GET_ORIGINAL_MIMETYPE");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1036,7 +1036,7 @@
case GET_DRM_OBJECT_TYPE:
{
- LOGV("BnDrmManagerService::onTransact :GET_DRM_OBJECT_TYPE");
+ ALOGV("BnDrmManagerService::onTransact :GET_DRM_OBJECT_TYPE");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1050,7 +1050,7 @@
case CHECK_RIGHTS_STATUS:
{
- LOGV("BnDrmManagerService::onTransact :CHECK_RIGHTS_STATUS");
+ ALOGV("BnDrmManagerService::onTransact :CHECK_RIGHTS_STATUS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1064,7 +1064,7 @@
case CONSUME_RIGHTS:
{
- LOGV("BnDrmManagerService::onTransact :CONSUME_RIGHTS");
+ ALOGV("BnDrmManagerService::onTransact :CONSUME_RIGHTS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1084,7 +1084,7 @@
case SET_PLAYBACK_STATUS:
{
- LOGV("BnDrmManagerService::onTransact :SET_PLAYBACK_STATUS");
+ ALOGV("BnDrmManagerService::onTransact :SET_PLAYBACK_STATUS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1104,7 +1104,7 @@
case VALIDATE_ACTION:
{
- LOGV("BnDrmManagerService::onTransact :VALIDATE_ACTION");
+ ALOGV("BnDrmManagerService::onTransact :VALIDATE_ACTION");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1121,7 +1121,7 @@
case REMOVE_RIGHTS:
{
- LOGV("BnDrmManagerService::onTransact :REMOVE_RIGHTS");
+ ALOGV("BnDrmManagerService::onTransact :REMOVE_RIGHTS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
int uniqueId = data.readInt32();
@@ -1134,7 +1134,7 @@
case REMOVE_ALL_RIGHTS:
{
- LOGV("BnDrmManagerService::onTransact :REMOVE_ALL_RIGHTS");
+ ALOGV("BnDrmManagerService::onTransact :REMOVE_ALL_RIGHTS");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const status_t status = removeAllRights(data.readInt32());
@@ -1145,7 +1145,7 @@
case OPEN_CONVERT_SESSION:
{
- LOGV("BnDrmManagerService::onTransact :OPEN_CONVERT_SESSION");
+ ALOGV("BnDrmManagerService::onTransact :OPEN_CONVERT_SESSION");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1158,7 +1158,7 @@
case CONVERT_DATA:
{
- LOGV("BnDrmManagerService::onTransact :CONVERT_DATA");
+ ALOGV("BnDrmManagerService::onTransact :CONVERT_DATA");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1193,7 +1193,7 @@
case CLOSE_CONVERT_SESSION:
{
- LOGV("BnDrmManagerService::onTransact :CLOSE_CONVERT_SESSION");
+ ALOGV("BnDrmManagerService::onTransact :CLOSE_CONVERT_SESSION");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1223,7 +1223,7 @@
case GET_ALL_SUPPORT_INFO:
{
- LOGV("BnDrmManagerService::onTransact :GET_ALL_SUPPORT_INFO");
+ ALOGV("BnDrmManagerService::onTransact :GET_ALL_SUPPORT_INFO");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1257,7 +1257,7 @@
case OPEN_DECRYPT_SESSION:
{
- LOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION");
+ ALOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1278,7 +1278,7 @@
case OPEN_DECRYPT_SESSION_FROM_URI:
{
- LOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION_FROM_URI");
+ ALOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION_FROM_URI");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1292,14 +1292,14 @@
clearDecryptHandle(handle);
delete handle; handle = NULL;
} else {
- LOGV("NULL decryptHandle is returned");
+ ALOGV("NULL decryptHandle is returned");
}
return DRM_NO_ERROR;
}
case CLOSE_DECRYPT_SESSION:
{
- LOGV("BnDrmManagerService::onTransact :CLOSE_DECRYPT_SESSION");
+ ALOGV("BnDrmManagerService::onTransact :CLOSE_DECRYPT_SESSION");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1314,7 +1314,7 @@
case INITIALIZE_DECRYPT_UNIT:
{
- LOGV("BnDrmManagerService::onTransact :INITIALIZE_DECRYPT_UNIT");
+ ALOGV("BnDrmManagerService::onTransact :INITIALIZE_DECRYPT_UNIT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1340,7 +1340,7 @@
case DECRYPT:
{
- LOGV("BnDrmManagerService::onTransact :DECRYPT");
+ ALOGV("BnDrmManagerService::onTransact :DECRYPT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1384,7 +1384,7 @@
case FINALIZE_DECRYPT_UNIT:
{
- LOGV("BnDrmManagerService::onTransact :FINALIZE_DECRYPT_UNIT");
+ ALOGV("BnDrmManagerService::onTransact :FINALIZE_DECRYPT_UNIT");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
@@ -1401,7 +1401,7 @@
case PREAD:
{
- LOGV("BnDrmManagerService::onTransact :READ");
+ ALOGV("BnDrmManagerService::onTransact :READ");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index b2fa053..3abf3d3 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -476,7 +476,7 @@
}
if (DRM_NO_ERROR != result) {
delete handle; handle = NULL;
- LOGV("DrmManager::openDecryptSession: no capable plug-in found");
+ ALOGV("DrmManager::openDecryptSession: no capable plug-in found");
}
return handle;
}
diff --git a/drm/drmserver/DrmManagerService.cpp b/drm/drmserver/DrmManagerService.cpp
index 7ebcac3..df17ac5 100644
--- a/drm/drmserver/DrmManagerService.cpp
+++ b/drm/drmserver/DrmManagerService.cpp
@@ -52,7 +52,7 @@
}
void DrmManagerService::instantiate() {
- LOGV("instantiate");
+ ALOGV("instantiate");
defaultServiceManager()->addService(String16("drm.drmManager"), new DrmManagerService());
if (0 >= trustedUids.size()) {
@@ -67,13 +67,13 @@
DrmManagerService::DrmManagerService() :
mDrmManager(NULL) {
- LOGV("created");
+ ALOGV("created");
mDrmManager = new DrmManager();
mDrmManager->loadPlugIns();
}
DrmManagerService::~DrmManagerService() {
- LOGV("Destroyed");
+ ALOGV("Destroyed");
mDrmManager->unloadPlugIns();
delete mDrmManager; mDrmManager = NULL;
}
@@ -96,120 +96,120 @@
status_t DrmManagerService::setDrmServiceListener(
int uniqueId, const sp<IDrmServiceListener>& drmServiceListener) {
- LOGV("Entering setDrmServiceListener");
+ ALOGV("Entering setDrmServiceListener");
mDrmManager->setDrmServiceListener(uniqueId, drmServiceListener);
return DRM_NO_ERROR;
}
status_t DrmManagerService::installDrmEngine(int uniqueId, const String8& drmEngineFile) {
- LOGV("Entering installDrmEngine");
+ ALOGV("Entering installDrmEngine");
return mDrmManager->installDrmEngine(uniqueId, drmEngineFile);
}
DrmConstraints* DrmManagerService::getConstraints(
int uniqueId, const String8* path, const int action) {
- LOGV("Entering getConstraints from content");
+ ALOGV("Entering getConstraints from content");
return mDrmManager->getConstraints(uniqueId, path, action);
}
DrmMetadata* DrmManagerService::getMetadata(int uniqueId, const String8* path) {
- LOGV("Entering getMetadata from content");
+ ALOGV("Entering getMetadata from content");
return mDrmManager->getMetadata(uniqueId, path);
}
bool DrmManagerService::canHandle(int uniqueId, const String8& path, const String8& mimeType) {
- LOGV("Entering canHandle");
+ ALOGV("Entering canHandle");
return mDrmManager->canHandle(uniqueId, path, mimeType);
}
DrmInfoStatus* DrmManagerService::processDrmInfo(int uniqueId, const DrmInfo* drmInfo) {
- LOGV("Entering processDrmInfo");
+ ALOGV("Entering processDrmInfo");
return mDrmManager->processDrmInfo(uniqueId, drmInfo);
}
DrmInfo* DrmManagerService::acquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) {
- LOGV("Entering acquireDrmInfo");
+ ALOGV("Entering acquireDrmInfo");
return mDrmManager->acquireDrmInfo(uniqueId, drmInfoRequest);
}
status_t DrmManagerService::saveRights(
int uniqueId, const DrmRights& drmRights,
const String8& rightsPath, const String8& contentPath) {
- LOGV("Entering saveRights");
+ ALOGV("Entering saveRights");
return mDrmManager->saveRights(uniqueId, drmRights, rightsPath, contentPath);
}
String8 DrmManagerService::getOriginalMimeType(int uniqueId, const String8& path) {
- LOGV("Entering getOriginalMimeType");
+ ALOGV("Entering getOriginalMimeType");
return mDrmManager->getOriginalMimeType(uniqueId, path);
}
int DrmManagerService::getDrmObjectType(
int uniqueId, const String8& path, const String8& mimeType) {
- LOGV("Entering getDrmObjectType");
+ ALOGV("Entering getDrmObjectType");
return mDrmManager->getDrmObjectType(uniqueId, path, mimeType);
}
int DrmManagerService::checkRightsStatus(
int uniqueId, const String8& path, int action) {
- LOGV("Entering checkRightsStatus");
+ ALOGV("Entering checkRightsStatus");
return mDrmManager->checkRightsStatus(uniqueId, path, action);
}
status_t DrmManagerService::consumeRights(
int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve) {
- LOGV("Entering consumeRights");
+ ALOGV("Entering consumeRights");
return mDrmManager->consumeRights(uniqueId, decryptHandle, action, reserve);
}
status_t DrmManagerService::setPlaybackStatus(
int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
- LOGV("Entering setPlaybackStatus");
+ ALOGV("Entering setPlaybackStatus");
return mDrmManager->setPlaybackStatus(uniqueId, decryptHandle, playbackStatus, position);
}
bool DrmManagerService::validateAction(
int uniqueId, const String8& path,
int action, const ActionDescription& description) {
- LOGV("Entering validateAction");
+ ALOGV("Entering validateAction");
return mDrmManager->validateAction(uniqueId, path, action, description);
}
status_t DrmManagerService::removeRights(int uniqueId, const String8& path) {
- LOGV("Entering removeRights");
+ ALOGV("Entering removeRights");
return mDrmManager->removeRights(uniqueId, path);
}
status_t DrmManagerService::removeAllRights(int uniqueId) {
- LOGV("Entering removeAllRights");
+ ALOGV("Entering removeAllRights");
return mDrmManager->removeAllRights(uniqueId);
}
int DrmManagerService::openConvertSession(int uniqueId, const String8& mimeType) {
- LOGV("Entering openConvertSession");
+ ALOGV("Entering openConvertSession");
return mDrmManager->openConvertSession(uniqueId, mimeType);
}
DrmConvertedStatus* DrmManagerService::convertData(
int uniqueId, int convertId, const DrmBuffer* inputData) {
- LOGV("Entering convertData");
+ ALOGV("Entering convertData");
return mDrmManager->convertData(uniqueId, convertId, inputData);
}
DrmConvertedStatus* DrmManagerService::closeConvertSession(int uniqueId, int convertId) {
- LOGV("Entering closeConvertSession");
+ ALOGV("Entering closeConvertSession");
return mDrmManager->closeConvertSession(uniqueId, convertId);
}
status_t DrmManagerService::getAllSupportInfo(
int uniqueId, int* length, DrmSupportInfo** drmSupportInfoArray) {
- LOGV("Entering getAllSupportInfo");
+ ALOGV("Entering getAllSupportInfo");
return mDrmManager->getAllSupportInfo(uniqueId, length, drmSupportInfoArray);
}
DecryptHandle* DrmManagerService::openDecryptSession(
int uniqueId, int fd, off64_t offset, off64_t length) {
- LOGV("Entering DrmManagerService::openDecryptSession");
+ ALOGV("Entering DrmManagerService::openDecryptSession");
if (isProtectedCallAllowed()) {
return mDrmManager->openDecryptSession(uniqueId, fd, offset, length);
}
@@ -219,7 +219,7 @@
DecryptHandle* DrmManagerService::openDecryptSession(
int uniqueId, const char* uri) {
- LOGV("Entering DrmManagerService::openDecryptSession with uri");
+ ALOGV("Entering DrmManagerService::openDecryptSession with uri");
if (isProtectedCallAllowed()) {
return mDrmManager->openDecryptSession(uniqueId, uri);
}
@@ -228,32 +228,32 @@
}
status_t DrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
- LOGV("Entering closeDecryptSession");
+ ALOGV("Entering closeDecryptSession");
return mDrmManager->closeDecryptSession(uniqueId, decryptHandle);
}
status_t DrmManagerService::initializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle,
int decryptUnitId, const DrmBuffer* headerInfo) {
- LOGV("Entering initializeDecryptUnit");
+ ALOGV("Entering initializeDecryptUnit");
return mDrmManager->initializeDecryptUnit(uniqueId,decryptHandle, decryptUnitId, headerInfo);
}
status_t DrmManagerService::decrypt(
int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId,
const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {
- LOGV("Entering decrypt");
+ ALOGV("Entering decrypt");
return mDrmManager->decrypt(uniqueId, decryptHandle, decryptUnitId, encBuffer, decBuffer, IV);
}
status_t DrmManagerService::finalizeDecryptUnit(
int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) {
- LOGV("Entering finalizeDecryptUnit");
+ ALOGV("Entering finalizeDecryptUnit");
return mDrmManager->finalizeDecryptUnit(uniqueId, decryptHandle, decryptUnitId);
}
ssize_t DrmManagerService::pread(int uniqueId, DecryptHandle* decryptHandle,
void* buffer, ssize_t numBytes, off64_t offset) {
- LOGV("Entering pread");
+ ALOGV("Entering pread");
return mDrmManager->pread(uniqueId, decryptHandle, buffer, numBytes, offset);
}
diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
index e184545..7799040 100644
--- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
+++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp
@@ -43,7 +43,7 @@
#ifdef DRM_OMA_FL_ENGINE_DEBUG
#define LOG_NDEBUG 0
-#define LOG_VERBOSE(...) LOGV(__VA_ARGS__)
+#define LOG_VERBOSE(...) ALOGV(__VA_ARGS__)
#else
#define LOG_VERBOSE(...)
#endif