diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-01-19 14:45:03 -0800 |
commit | c6aacce37191e1cc79cfeba13b39899f59c68c3b (patch) | |
tree | df4401aaa38914e03d5eadc82507e7c6fdcc573e /drm | |
parent | a51f0e707f1f3142358aa919ea60ad2842803139 (diff) | |
download | frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.zip frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.tar.gz frameworks_base-c6aacce37191e1cc79cfeba13b39899f59c68c3b.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Diffstat (limited to 'drm')
-rw-r--r-- | drm/common/ReadWriteUtils.cpp | 4 | ||||
-rw-r--r-- | drm/jni/android_drm_DrmManagerClient.cpp | 2 | ||||
-rw-r--r-- | drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp | 22 |
3 files changed, 14 insertions, 14 deletions
diff --git a/drm/common/ReadWriteUtils.cpp b/drm/common/ReadWriteUtils.cpp index c16214e..fd17e98 100644 --- a/drm/common/ReadWriteUtils.cpp +++ b/drm/common/ReadWriteUtils.cpp @@ -85,7 +85,7 @@ void ReadWriteUtils::writeToFile(const String8& filePath, const String8& data) { int size = data.size(); if (FAILURE != ftruncate(fd, size)) { if (size != write(fd, data.string(), size)) { - LOGE("Failed to write the data to: %s", filePath.string()); + ALOGE("Failed to write the data to: %s", filePath.string()); } } fclose(file); @@ -101,7 +101,7 @@ void ReadWriteUtils::appendToFile(const String8& filePath, const String8& data) int size = data.size(); if (size != write(fd, data.string(), size)) { - LOGE("Failed to write the data to: %s", filePath.string()); + ALOGE("Failed to write the data to: %s", filePath.string()); } fclose(file); } diff --git a/drm/jni/android_drm_DrmManagerClient.cpp b/drm/jni/android_drm_DrmManagerClient.cpp index e34046f..dfc7fb2 100644 --- a/drm/jni/android_drm_DrmManagerClient.cpp +++ b/drm/jni/android_drm_DrmManagerClient.cpp @@ -169,7 +169,7 @@ JNIOnInfoListener::JNIOnInfoListener(JNIEnv* env, jobject thiz, jobject weak_thi jclass clazz = env->GetObjectClass(thiz); if (clazz == NULL) { - LOGE("Can't find android/drm/DrmManagerClient"); + ALOGE("Can't find android/drm/DrmManagerClient"); jniThrowException(env, "java/lang/Exception", NULL); return; } diff --git a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp index 7799040..0273a4b 100644 --- a/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp +++ b/drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp @@ -92,12 +92,12 @@ int FwdLockEngine::getConvertedStatus(FwdLockConv_Status_t status) { case FwdLockConv_Status_InvalidArgument: case FwdLockConv_Status_UnsupportedFileFormat: case FwdLockConv_Status_UnsupportedContentTransferEncoding: - LOGE("FwdLockEngine getConvertedStatus: file conversion Error %d. " + ALOGE("FwdLockEngine getConvertedStatus: file conversion Error %d. " "Returning STATUS_INPUTDATA_ERROR", status); retStatus = DrmConvertedStatus::STATUS_INPUTDATA_ERROR; break; default: - LOGE("FwdLockEngine getConvertedStatus: file conversion Error %d. " + ALOGE("FwdLockEngine getConvertedStatus: file conversion Error %d. " "Returning STATUS_ERROR", status); retStatus = DrmConvertedStatus::STATUS_ERROR; break; @@ -139,7 +139,7 @@ android::status_t FwdLockEngine::onInitialize(int uniqueId) { if (FwdLockGlue_InitializeKeyEncryption()) { LOG_VERBOSE("FwdLockEngine::onInitialize -- FwdLockGlue_InitializeKeyEncryption succeeded"); } else { - LOGE("FwdLockEngine::onInitialize -- FwdLockGlue_InitializeKeyEncryption failed:" + ALOGE("FwdLockEngine::onInitialize -- FwdLockGlue_InitializeKeyEncryption failed:" "errno = %d", errno); } @@ -351,7 +351,7 @@ status_t FwdLockEngine::onOpenConvertSession(int uniqueId, convertSessionMap.addValue(convertId, newSession); result = DRM_NO_ERROR; } else { - LOGE("FwdLockEngine::onOpenConvertSession -- FwdLockConv_OpenSession failed."); + ALOGE("FwdLockEngine::onOpenConvertSession -- FwdLockConv_OpenSession failed."); delete newSession; } } @@ -448,7 +448,7 @@ status_t FwdLockEngine::onOpenDecryptSession(int uniqueId, (!decodeSessionMap.isCreated(decryptHandle->decryptId))) { fileDesc = dup(fd); } else { - LOGE("FwdLockEngine::onOpenDecryptSession parameter error"); + ALOGE("FwdLockEngine::onOpenDecryptSession parameter error"); return result; } @@ -550,13 +550,13 @@ status_t FwdLockEngine::onInitializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId, const DrmBuffer* headerInfo) { - LOGE("FwdLockEngine::onInitializeDecryptUnit is not supported for this DRM scheme"); + ALOGE("FwdLockEngine::onInitializeDecryptUnit is not supported for this DRM scheme"); return DRM_ERROR_UNKNOWN; } status_t FwdLockEngine::onDecrypt(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId, const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) { - LOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); + ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); return DRM_ERROR_UNKNOWN; } @@ -565,14 +565,14 @@ status_t FwdLockEngine::onDecrypt(int uniqueId, int decryptUnitId, const DrmBuffer* encBuffer, DrmBuffer** decBuffer) { - LOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); + ALOGE("FwdLockEngine::onDecrypt is not supported for this DRM scheme"); return DRM_ERROR_UNKNOWN; } status_t FwdLockEngine::onFinalizeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) { - LOGE("FwdLockEngine::onFinalizeDecryptUnit is not supported for this DRM scheme"); + ALOGE("FwdLockEngine::onFinalizeDecryptUnit is not supported for this DRM scheme"); return DRM_ERROR_UNKNOWN; } @@ -650,11 +650,11 @@ ssize_t FwdLockEngine::onPread(int uniqueId, if (((off_t)-1) != decoderSession->offset) { bytesRead = onRead(uniqueId, decryptHandle, buffer, numBytes); if (bytesRead < 0) { - LOGE("FwdLockEngine::onPread error reading"); + ALOGE("FwdLockEngine::onPread error reading"); } } } else { - LOGE("FwdLockEngine::onPread decryptId not found"); + ALOGE("FwdLockEngine::onPread decryptId not found"); } return bytesRead; |