commit d3a25ad4b98d717673cb3a81ae1344ff90107d8c
author Jeff Sharkey <jsharkey@google.com> Tue Apr 19 17:10:54 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 17:10:56 2016 +0000
tree a95ff0303b90b9006660299e9011f79f040f78ae
parent 00c9815d942265719de92a19e243c1c970929210
parent cb45951cad9d403fd9933d723657d6d5838f5e59

Merge "Disable "defusable" logging for now." into nyc-dev

core/java/android/os/BaseBundle.java

diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java
index b6c919e..6d74056 100644
--- a/core/java/android/os/BaseBundle.java
+++ b/core/java/android/os/BaseBundle.java
@@ -49,6 +49,8 @@
      */
     static final int FLAG_DEFUSABLE = 1 << 0;
 
+    private static final boolean LOG_DEFUSABLE = false;
+
     private static volatile boolean sShouldDefuse = false;
 
     /**
@@ -229,7 +231,7 @@
             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());
         }