commit e6fe2510b6065f7bba72eb440ef657530e2c1653
author Marc Blank <mblank@google.com> Wed Apr 04 11:42:30 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 04 11:42:30 2012 -0700
tree 0f214c913559ecdc918fe85c0cf498aece47ed87
parent 312a0dad1c27e31a715f85979c70e12e65438b50
parent a8352055eba7117f26d17137c3cc884faf216006

Merge "Add flag for folder settings support"

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index fb45614..bb907c8 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -834,6 +834,7 @@
                 mAccount = ((Account) intent.getParcelableExtra(Utils.EXTRA_ACCOUNT));
                 mActionBarView.setAccount(mAccount);
                 fetchSearchFolder(intent);
+                restartOptionalLoader(LOADER_ACCOUNT_SETTINGS, null /* args */);
             }
         }
 

src/com/android/mail/utils/LogUtils.java

diff --git a/src/com/android/mail/utils/LogUtils.java b/src/com/android/mail/utils/LogUtils.java
index bf407c7..80aafa8 100644
--- a/src/com/android/mail/utils/LogUtils.java
+++ b/src/com/android/mail/utils/LogUtils.java
@@ -68,16 +68,6 @@
      */
     private static final int MAX_ENABLED_LOG_LEVEL = VERBOSE;
 
-    /**
-     * The minimum log level that is enabled by default.  The documentation for
-     * {@link Log#isLoggable(String, int)} states that INFO logs are enabled by default
-     * CL https://android-git.corp.google.com/g/159532, changed the behavior of this.
-     * This bug has been written up in b/6265031.  Untile that is fixed, assume that INFO
-     * logs are enabled by default.
-     */
-    private static final int MIN_DEFAULT_ENABLED_LOG_LEVEL = INFO;
-
-
     private static Boolean sDebugLoggingEnabledForTests = null;
 
     /**
@@ -178,8 +168,6 @@
     public static boolean isLoggable(String tag, int level) {
         if (MAX_ENABLED_LOG_LEVEL > level) {
             return false;
-        } else if (MIN_DEFAULT_ENABLED_LOG_LEVEL <= level) {
-            return true;
         }
         return Log.isLoggable(tag, level);
     }