diff options
| author | 2022-11-01 11:54:07 +0000 | |
|---|---|---|
| committer | 2022-11-01 11:54:07 +0000 | |
| commit | d1b90dae5ab29b275ad5a97261c4bdf626102fa3 (patch) | |
| tree | f089032235dacbddca0a8e984f1c65b46326431f | |
| parent | e12c348385d06a8477cf089682d7cb9d739f200c (diff) | |
| parent | 330457eb022e13aebc28c5a6122ebd2cf6aa22c4 (diff) | |
Merge "Merge "Parcel: noop upon double recycle" am: 0c35c51d71 am: 79ff332cac" into tm-qpr-dev-plus-aosp am: 330457eb02
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2263989
Change-Id: Icadeaaa0d6d4cec58109a84e3ccd5068766ddb31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/os/Parcel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 2afa87980c11..1673ade04150 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -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; |