Merge "Disable "defusable" logging for now." into nyc-dev am: d3a25ad am: ea54db6

am: df6d014

* commit 'df6d01463adf4b96bdd4dc317ac7b479bb2bc0d4':
  Disable "defusable" logging for now.

Change-Id: I6458200608363a58c8a769fdcc4d309bb4e8de91

core/java/android/os/BaseBundle.java

@@ -49,6 +49,8 @@ public class BaseBundle {
      */
     static final int FLAG_DEFUSABLE = 1 << 0;
 
+    private static final boolean LOG_DEFUSABLE = false;
+
     private static volatile boolean sShouldDefuse = false;
 
     /**
@@ -217,7 +219,7 @@ public class BaseBundle {
             return;
         }
 
-        if (sShouldDefuse && (mFlags & FLAG_DEFUSABLE) == 0) {
+        if (LOG_DEFUSABLE && sShouldDefuse && (mFlags & FLAG_DEFUSABLE) == 0) {
             Slog.wtf(TAG, "Attempting to unparcel a Bundle while in transit; this may "
                     + "clobber all data inside!", new Throwable());
         }