widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

Browse Source 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I9b2273ef758c78d927591c1a0a9f988de739742c
This commit is contained in:
Steve Block
2012-01-08 10:17:01 +00:00
parent b443024341
commit 7284b7e7f3
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp
View File

@@ -249,7 +249,7 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI
// creates a data store object per each portal
credentials.portal = drmInfoRequest->get(String8("WVPortalKey")).string();
if ( (assetPath.size() == 0) || (credentials.portal.size() == 0) ) {
LOGE("onAcquireDrmInfo: Empty asset path or portal string, must specify both");
ALOGE("onAcquireDrmInfo: Empty asset path or portal string, must specify both");
return NULL;
}
@@ -309,18 +309,18 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI
std::string portal = drmInfoRequest->get(String8("WVPortalKey")).string();
if (portal.size() == 0) {
LOGE("onAcquireDrmInfo: Must specify portal string for registration operations");
ALOGE("onAcquireDrmInfo: Must specify portal string for registration operations");
return NULL;
}
if (drmInfoRequest->getInfoType()==DrmInfoRequest::TYPE_REGISTRATION_INFO) {
if (!mDrmPluginImpl->RegisterDrmInfo(portal, assetDbPath)) {
LOGE("onAcquireDrmInfo: RegisterDrmInfo failed");
ALOGE("onAcquireDrmInfo: RegisterDrmInfo failed");
return NULL;
}
} else {
if (!mDrmPluginImpl->UnregisterDrmInfo(portal, assetDbPath)) {
LOGE("onAcquireDrmInfo: UnregisterDrmInfo failed");
ALOGE("onAcquireDrmInfo: UnregisterDrmInfo failed");
return NULL;
}
}
@@ -335,12 +335,12 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI
break;
}
case DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO: {
LOGE("onAcquireDrmInfo: Unsupported DrmInfoRequest type %d",
ALOGE("onAcquireDrmInfo: Unsupported DrmInfoRequest type %d",
drmInfoRequest->getInfoType());
break;
}
default: {
LOGE("onAcquireDrmInfo: Unknown info type %d", drmInfoRequest->getInfoType());
ALOGE("onAcquireDrmInfo: Unknown info type %d", drmInfoRequest->getInfoType());
break;
}
}
@@ -372,10 +372,10 @@ DrmInfoStatus* WVMDrmPlugin::onProcessDrmInfo(int uniqueId, const DrmInfo* drmIn
(drmInfo->getInfoType() == DrmInfoRequest::TYPE_UNREGISTRATION_INFO)) {
status = DrmInfoStatus::STATUS_OK;
} else {
LOGE("onProcessDrmInfo : drmInfo type %d not supported", drmInfo->getInfoType());
ALOGE("onProcessDrmInfo : drmInfo type %d not supported", drmInfo->getInfoType());
}
} else {
LOGE("onProcessDrmInfo : drmInfo cannot be NULL");
ALOGE("onProcessDrmInfo : drmInfo cannot be NULL");
}
String8 licenseString("dummy_license_string");
@@ -407,7 +407,7 @@ DrmConstraints* WVMDrmPlugin::onGetConstraints(int uniqueId, const String8* path
//ALOGD("WVMDrmPlugin::onGetConstraints : %d", uniqueId);
if ( (Action::DEFAULT != action) && (Action::PLAY != action) ) {
LOGE("onGetConstraints : action %d not supported", action);
ALOGE("onGetConstraints : action %d not supported", action);
return NULL;
}
@@ -566,7 +566,7 @@ int WVMDrmPlugin::onCheckRightsStatus(int uniqueId, const String8& path, int act
//ALOGD("WVMDrmPlugin::onCheckRightsStatus() : %d", uniqueId);
if ( (Action::DEFAULT != action) && (Action::PLAY != action) ) {
LOGE("onCheckRightsStatus : action %d not supported", action);
ALOGE("onCheckRightsStatus : action %d not supported", action);
return RightsStatus::RIGHTS_INVALID;
}