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

Commit ea54db6b 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

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

Change-Id: I921c3f383a00ac8e8b5b1568b855420a8e191bf8
parents 1e922152 d3a25ad4

core/java/android/os/BaseBundle.java

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

        }

        }