Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE (29357bc2) · Commits · e / os / android_frameworks_av

camera/Camera.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,7 @@ const sp<ICameraService>& Camera::getCameraService()
		binder->linkToDeath(mDeathNotifier);
		mCameraService = interface_cast<ICameraService>(binder);
		}
		LOGE_IF(mCameraService==0, "no CameraService!?");
		ALOGE_IF(mCameraService==0, "no CameraService!?");
		return mCameraService;
		}

		@@ -72,7 +72,7 @@ sp<Camera> Camera::create(const sp<ICamera>& camera)
		{
		ALOGV("create");
		if (camera == 0) {
		LOGE("camera remote is a NULL pointer");
		ALOGE("camera remote is a NULL pointer");
		return 0;
		}

camera/CameraParameters.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -231,12 +231,12 @@ void CameraParameters::set(const char key, const char value)
		{
		// XXX i think i can do this with strspn()
		if (strchr(key, '=') \|\| strchr(key, ';')) {
		//XXX LOGE("Key \"%s\"contains invalid character (= or ;)", key);
		//XXX ALOGE("Key \"%s\"contains invalid character (= or ;)", key);
		return;
		}

		if (strchr(value, '=') \|\| strchr(key, ';')) {
		//XXX LOGE("Value \"%s\"contains invalid character (= or ;)", value);
		//XXX ALOGE("Value \"%s\"contains invalid character (= or ;)", value);
		return;
		}

		@@ -294,7 +294,7 @@ static int parse_pair(const char str, int first, int *second, char delim,
		int w = (int)strtol(str, &end, 10);
		// If a delimeter does not immediately follow, give up.
		if (*end != delim) {
		LOGE("Cannot find delimeter (%c) in str=%s", delim, str);
		ALOGE("Cannot find delimeter (%c) in str=%s", delim, str);
		return -1;
		}

		@@ -324,7 +324,7 @@ static void parseSizesList(const char *sizesStr, Vector<Size> &sizes)
		int success = parse_pair(sizeStartPtr, &width, &height, 'x',
		&sizeStartPtr);
		if (success == -1 \|\| (sizeStartPtr != ',' && sizeStartPtr != '\0')) {
		LOGE("Picture sizes string \"%s\" contains invalid character.", sizesStr);
		ALOGE("Picture sizes string \"%s\" contains invalid character.", sizesStr);
		return;
		}
		sizes.push(Size(width, height));

cmds/stagefright/sf2.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -454,7 +454,7 @@ private:

		if (sizeNeeded > sizeLeft) {
		if (outBuffer->size() == 0) {
		LOGE("Unable to fit even a single input buffer of size %d.",
		ALOGE("Unable to fit even a single input buffer of size %d.",
		sizeNeeded);
		}
		CHECK_GT(outBuffer->size(), 0u);

drm/common/ReadWriteUtils.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

drm/libdrmframework/plugins/forward-lock/FwdLockEngine/src/FwdLockEngine.cpp

+11 −11

Original line number	Diff line number	Diff line
		@@ -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;