diff options
| author |   satok <satok@google.com> | 2010-06-03 14:54:35 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2010-06-03 15:25:18 +0900 |
| commit | 4ff7bbcb97a6b71d84c927e3e4a30dd4dd2494b9 (patch) | |
| tree | 50bd81f3826f769257a626229a729bb42e317090 /java/src/com/android/inputmethod/latin/LatinImeLogger.java | |
| parent | 219d9d52e54571dbc974083d6a57e405fd94153b (diff) | |
| download | latinime-4ff7bbcb97a6b71d84c927e3e4a30dd4dd2494b9.tar.gz latinime-4ff7bbcb97a6b71d84c927e3e4a30dd4dd2494b9.tar.xz latinime-4ff7bbcb97a6b71d84c927e3e4a30dd4dd2494b9.zip | |
Fix a bug that force closing happens even when SUPPRESS_EXCEPTION flag is on.
Change-Id: I927b11da1e62b147813fbbf01e2afce5915aed73
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinImeLogger.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinImeLogger.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinImeLogger.java b/java/src/com/android/inputmethod/latin/LatinImeLogger.java index 7ad0ec63b..474281058 100644 --- a/java/src/com/android/inputmethod/latin/LatinImeLogger.java +++ b/java/src/com/android/inputmethod/latin/LatinImeLogger.java @@ -39,7 +39,7 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang private static final boolean DBG = true; private static boolean sLOGPRINT = false; // SUPPRESS_EXCEPTION should be true when released to public. - private static final boolean SUPPRESS_EXCEPTION = false; + private static final boolean SUPPRESS_EXCEPTION = true; // DEFAULT_LOG_ENABLED should be false when released to public. private static final boolean DEFAULT_LOG_ENABLED = true; @@ -48,6 +48,8 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang private static final long MINIMUMSENDSIZE = 40; private static final char SEPARATER = ';'; private static final char NULL_CHAR = '\uFFFC'; + private static final int EXCEPTION_MAX_LENGTH = 400; + private static final int ID_MANUALSUGGESTION = 0; private static final int ID_AUTOSUGGESTIONCANCELLED = 1; private static final int ID_AUTOSUGGESTION = 2; @@ -368,7 +370,9 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang } private void commitInternalAndStopSelf() { - Log.e(TAG, "Exception was caused and let's die."); + if (DBG) { + Log.e(TAG, "Exception was thrown and let's die."); + } commitInternal(); LatinIME ime = ((LatinIME) mContext); ime.hideWindow(); @@ -539,10 +543,13 @@ public class LatinImeLogger implements SharedPreferences.OnSharedPreferenceChang ByteArrayOutputStream baos = new ByteArrayOutputStream(); PrintStream ps = new PrintStream(baos); e.printStackTrace(ps); - String exceptionString = new String(baos.toByteArray()); + String exceptionString = new String(baos.toByteArray(), 0, + Math.min(EXCEPTION_MAX_LENGTH, baos.size())); sLatinImeLogger.sendLogToDropBox( ID_EXCEPTION, new String[] {metaData, exceptionString}); - Log.e(TAG, "Exception: " + exceptionString); + if (DBG) { + Log.e(TAG, "Exception: " + new String(baos.toByteArray())); + } if (SUPPRESS_EXCEPTION) { sLatinImeLogger.commitInternalAndStopSelf(); } else { |