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

Commit d1b90dae authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Parcel: noop upon double recycle" am: 0c35c51d am: 79ff332c"... 

Merge "Merge "Parcel: noop upon double recycle" am: 0c35c51d am: 79ff332c" into tm-qpr-dev-plus-aosp am: 330457eb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989



Change-Id: Icadeaaa0d6d4cec58109a84e3ccd5068766ddb31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e12c3483 330457eb

core/java/android/os/Parcel.java

+3 −1
Original line number Diff line number Diff line
@@ -561,9 +561,11 @@ public final class Parcel { 
     */

    public final void recycle() {

        if (mRecycled) {

            Log.w(TAG, "Recycle called on unowned Parcel. (recycle twice?) Here: "

            Log.wtf(TAG, "Recycle called on unowned Parcel. (recycle twice?) Here: "

                    + Log.getStackTraceString(new Throwable())

                    + " Original recycle call (if DEBUG_RECYCLE): ", mStack);



            return;

        }

        mRecycled = true;