Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d3a25ad

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

Change-Id: I921c3f383a00ac8e8b5b1568b855420a8e191bf8
This commit is contained in:
Jeff Sharkey
2016-04-19 17:16:29 +00:00
committed by android-build-merger
parent 1e92215278 d3a25ad4b9
commit ea54db6b48
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/BaseBundle.java
View File

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