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

Commit 391246ae 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: 091fba44

* commit '091fba44':
  Disable "defusable" logging for now.

Change-Id: I4d2f2ae3a99ff9ab946e256e59ef77b2ddceb7ec
parents 7d333ce1 091fba44

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());

        }