Put the debug screen back into settings

There is still work to be done here:
* The debug setting is not persisted in Exchange, so if
the exchange service is killed, when it restarts the logging
will not be active.
* Nothing in Exchange actually does any additional logging
if this logging is turned on.

Change-Id: I5ec731791bf5297ee8d5ec4845f2e714b4bfa60f

2 files changed, 7 insertions, 1 deletions

diff --git a/src/com/android/exchange/Eas.java b/src/com/android/exchange/Eas.java
index 595f3287..325d15ea 100644
--- a/src/com/android/exchange/Eas.java
+++ b/src/com/android/exchange/Eas.java
@@ -133,7 +133,7 @@ public class Eas {
         // DEBUG takes precedence and is never true in a user build
         if (!DEBUG) {
             USER_LOG = (state & EmailServiceProxy.DEBUG_BIT) != 0;
-            PARSER_LOG = (state & EmailServiceProxy.DEBUG_VERBOSE_BIT) != 0;
+            PARSER_LOG = (state & EmailServiceProxy.DEBUG_EXCHANGE_BIT) != 0;
             FILE_LOG = (state & EmailServiceProxy.DEBUG_FILE_BIT) != 0;
             if (FILE_LOG || PARSER_LOG) {
                 USER_LOG = true;
diff --git a/src/com/android/exchange/service/EasService.java b/src/com/android/exchange/service/EasService.java
index 8c29ba1b..3f840984 100644
--- a/src/com/android/exchange/service/EasService.java
+++ b/src/com/android/exchange/service/EasService.java
@@ -77,6 +77,8 @@ public class EasService extends Service {
     /** Bookkeeping for ping tasks & sync threads management. */
     private final PingSyncSynchronizer mSynchronizer;
 
+    private boolean mDebuggingEnabled;
+
     /**
      * Implementation of the IEmailService interface.
      * For the most part these calls should consist of creating the correct {@link EasOperation}
@@ -206,6 +208,9 @@ public class EasService extends Service {
 
         @Override
         public void setLogging(final int flags) {
+            // TODO: This isn't persisted. If Exchange goes down and restarts, debugging will
+            // be turned off.
+            mDebuggingEnabled = ((flags & EmailServiceProxy.DEBUG_EXCHANGE_BIT) != 0);
             LogUtils.d(TAG, "IEmailService.setLogging");
         }
 
@@ -272,6 +277,7 @@ public class EasService extends Service {
     public EasService() {
         super();
         mSynchronizer = new PingSyncSynchronizer(this);
+        mDebuggingEnabled = false;
     }
 
     @Override