diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2011-07-25 18:36:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-25 18:36:57 -0700 |
| commit | b33d46cc77b0e96a4d0ff39b85158c5c4eca3855 (patch) | |
| tree | ab0864704714f7e0d738536f9070861c183473e7 /media | |
| parent | 01c4dccece0ca90605fc29b5880a0a4fc319acbb (diff) | |
| parent | 25ba294d1f7f16d285a98d4a8ec2524ca2f860da (diff) | |
| download | frameworks_base-b33d46cc77b0e96a4d0ff39b85158c5c4eca3855.zip frameworks_base-b33d46cc77b0e96a4d0ff39b85158c5c4eca3855.tar.gz frameworks_base-b33d46cc77b0e96a4d0ff39b85158c5c4eca3855.tar.bz2 | |
Merge "Add filename and line number in the debug messages."
Diffstat (limited to 'media')
| -rwxr-xr-x | media/jni/mediaeditor/VideoEditorJava.cpp | 29 | ||||
| -rwxr-xr-x | media/jni/mediaeditor/VideoEditorJava.h | 33 |
2 files changed, 47 insertions, 15 deletions
diff --git a/media/jni/mediaeditor/VideoEditorJava.cpp b/media/jni/mediaeditor/VideoEditorJava.cpp index 13f6350..ec8050f 100755 --- a/media/jni/mediaeditor/VideoEditorJava.cpp +++ b/media/jni/mediaeditor/VideoEditorJava.cpp @@ -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; diff --git a/media/jni/mediaeditor/VideoEditorJava.h b/media/jni/mediaeditor/VideoEditorJava.h index 9d7f096..0a2db08 100755 --- a/media/jni/mediaeditor/VideoEditorJava.h +++ b/media/jni/mediaeditor/VideoEditorJava.h @@ -351,26 +351,47 @@ typedef struct jmethodID methodIds[]; } VideoEditJava_MethodIds; +#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_checkAndThrowIllegalArgumentException( +videoEditJava_checkAndThrowIllegalArgumentExceptionFunc( bool* pResult, JNIEnv* pEnv, bool condition, - const char* pMessage); + const char* pMessage, + const char* pFile, + int lineNo + ); void -videoEditJava_checkAndThrowRuntimeException( +videoEditJava_checkAndThrowRuntimeExceptionFunc( bool* pResult, JNIEnv* pEnv, bool condition, - M4OSA_ERR result); + M4OSA_ERR result, + const char* pFile, + int lineNo + ); void -videoEditJava_checkAndThrowIllegalStateException( +videoEditJava_checkAndThrowIllegalStateExceptionFunc( bool* pResult, JNIEnv* pEnv, bool condition, - const char* pMessage); + const char* pMessage, + const char* pFile, + int lineNo + ); void videoEditJava_getClass( |