Merge "Merge "Parcel: noop upon double recycle" am: 0c35c51d71 am: 79ff332cac" into tm-qpr-dev-plus-aosp

2022-11-01 11:34:25 +00:00
parent 2ea61480fd 457b5d9438
commit 330457eb02
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -562,9 +562,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;