From cb45951cad9d403fd9933d723657d6d5838f5e59 Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Mon, 18 Apr 2016 13:53:53 -0600 Subject: [PATCH] Disable "defusable" logging for now. Bug: 28240784 Change-Id: I2c259867a8169eef220fb9faea6cdcafdde675b8 --- core/java/android/os/BaseBundle.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/android/os/BaseBundle.java b/core/java/android/os/BaseBundle.java index b6c919e27277..6d74056d66de 100644 --- a/core/java/android/os/BaseBundle.java +++ b/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; /** @@ -229,7 +231,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()); } -- 2.11.0