Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df6d0146 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: ea54db6b

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

Change-Id: Ie1bb02c88e7cea2db99da9c06ae2778363f42f1b
parents 8a5139ab ea54db6b

core/java/android/os/BaseBundle.java

+3 −1
Original line number Diff line number Diff line
@@ -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());

        }