am bbcd8597: am 9d43de5d: Remove parser logging from standard SD logging

Merge commit 'bbcd8597c188afb095c5ea60211743b019f9e065'

* commit 'bbcd8597c188afb095c5ea60211743b019f9e065':
  Remove parser logging from standard SD logging
This commit is contained in:
Marc Blank 2009-09-19 22:33:58 -07:00 committed by Android Git Automerger
commit fa15551e8d
2 changed files with 2 additions and 5 deletions

View File

@ -165,7 +165,7 @@
<!-- Checkbox label, shown only on debug screen -->
<string name="debug_enable_sensitive_logging_label">Enable sensitive information debug logging? (May show passwords in logs.)</string>
<!-- Checkbox label, shown only on debug screen -->
<string name="debug_enable_exchange_logging_label">Enable exchange debug logging?</string>
<string name="debug_enable_exchange_logging_label">Enable exchange parser logging? (Extremely verbose)</string>
<!-- Checkbox label, shown only on debug screen -->
<string name="debug_enable_exchange_file_logging_label">Enable exchange sd card logging?</string>

View File

@ -76,10 +76,7 @@ public class Eas {
USER_LOG = (state & DEBUG_BIT) != 0;
PARSER_LOG = (state & DEBUG_EXCHANGE_BIT) != 0;
FILE_LOG = (state & DEBUG_FILE_BIT) != 0;
if (FILE_LOG) {
PARSER_LOG = true;
USER_LOG = true;
} else if (PARSER_LOG) {
if (FILE_LOG || PARSER_LOG) {
USER_LOG = true;
}
Log.d("Eas Debug", "Logging: " + (USER_LOG ? "User " : "") +