Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add filename and line number in the debug messages."

Browse Source
This commit is contained in:
Chih-Chung Chang
2011-07-25 18:36:57 -07:00
committed by Android (Google) Code Review
parent 01c4dccece 25ba294d1f
commit b33d46cc77
2 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
media/jni/mediaeditor/VideoEditorJava.cpp
View File

@@ -25,11 +25,13 @@ extern "C" {
void
videoEditJava_checkAndThrowIllegalArgumentException(
videoEditJava_checkAndThrowIllegalArgumentExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
const char* pMessage)
const char* pMessage,
const char* pFile,
int lineNo)
{
// Check if the previous action succeeded.
if (*pResult)
@@ -39,7 +41,8 @@ videoEditJava_checkAndThrowIllegalArgumentException(
{
// Log the exception.
VIDEOEDIT_LOG_EXCEPTION(ANDROID_LOG_ERROR, "VIDEO_EDITOR_JAVA",\
"videoEditJava_checkAndThrowIllegalArgumentException, %s", pMessage);
"videoEditJava_checkAndThrowIllegalArgumentException, %s (%s:%d)",
pMessage, pFile, lineNo);
// Reset the result flag.
(*pResult) = false;
@@ -51,11 +54,14 @@ videoEditJava_checkAndThrowIllegalArgumentException(
}
void
videoEditJava_checkAndThrowRuntimeException(
videoEditJava_checkAndThrowRuntimeExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
M4OSA_ERR result)
M4OSA_ERR result,
const char* pFile,
int lineNo
)
{
const char* pMessage = NULL;
@@ -70,7 +76,8 @@ videoEditJava_checkAndThrowRuntimeException(
// Log the exception.
VIDEOEDIT_LOG_EXCEPTION(ANDROID_LOG_ERROR, "VIDEO_EDITOR_JAVA",
"videoEditJava_checkAndThrowRuntimeException, %s", pMessage);
"videoEditJava_checkAndThrowRuntimeException, %s (%s:%d)",
pMessage, pFile, lineNo);
// Reset the result flag.
(*pResult) = false;
@@ -82,11 +89,14 @@ videoEditJava_checkAndThrowRuntimeException(
}
void
videoEditJava_checkAndThrowIllegalStateException(
videoEditJava_checkAndThrowIllegalStateExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
const char* pMessage)
const char* pMessage,
const char* pFile,
int lineNo
)
{
// Check if the previous action succeeded.
if (*pResult)
@@ -96,7 +106,8 @@ videoEditJava_checkAndThrowIllegalStateException(
{
// Log the exception.
VIDEOEDIT_LOG_EXCEPTION(ANDROID_LOG_ERROR, "VIDEO_EDITOR_JAVA",
"videoEditJava_checkAndThrowIllegalStateException, %s", pMessage);
"videoEditJava_checkAndThrowIllegalStateException, %s (%s:%d)",
pMessage, pFile, lineNo);
// Reset the result flag.
(*pResult) = false;

41
media/jni/mediaeditor/VideoEditorJava.h
View File

@@ -351,26 +351,47 @@ typedef struct
jmethodID methodIds[];
} VideoEditJava_MethodIds;
void
videoEditJava_checkAndThrowIllegalArgumentException(
bool* pResult,
JNIEnv* pEnv,
bool condition,
const char* pMessage);
#define videoEditJava_checkAndThrowIllegalArgumentException(\
a, b, c, d) videoEditJava_checkAndThrowIllegalArgumentExceptionFunc(\
a, b, c, d, __FILE__, __LINE__)
#define videoEditJava_checkAndThrowRuntimeException(\
a, b, c, d) videoEditJava_checkAndThrowRuntimeExceptionFunc(\
a, b, c, d, __FILE__, __LINE__)
#define videoEditJava_checkAndThrowIllegalStateException(\
a, b, c, d) videoEditJava_checkAndThrowIllegalStateExceptionFunc(\
a, b, c, d, __FILE__, __LINE__)
void
videoEditJava_checkAndThrowRuntimeException(
videoEditJava_checkAndThrowIllegalArgumentExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
M4OSA_ERR result);
const char* pMessage,
const char* pFile,
int lineNo
);
void
videoEditJava_checkAndThrowIllegalStateException(
videoEditJava_checkAndThrowRuntimeExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
const char* pMessage);
M4OSA_ERR result,
const char* pFile,
int lineNo
);
void
videoEditJava_checkAndThrowIllegalStateExceptionFunc(
bool* pResult,
JNIEnv* pEnv,
bool condition,
const char* pMessage,
const char* pFile,
int lineNo
);
void
videoEditJava_getClass(