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

Commit 377d85d8 authored by Hani Kazmi's avatar Hani Kazmi Committed by Android (Google) Code Review
Browse files

Merge "Fix a race condition in BaseBundle." into main

parents 51ab791d e9b4f146
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -429,10 +429,9 @@ public class BaseBundle {
                        "Lazy values ref count below 0");
                // No more lazy values in mMap, so we can recycle the parcel early rather than
                // waiting for the next GC run
                if (mLazyValues == 0) {
                    Preconditions.checkState(mWeakParcelledData.get() != null,
                            "Parcel recycled earlier than expected");
                    recycleParcel(mWeakParcelledData.get());
                Parcel parcel = mWeakParcelledData.get();
                if (mLazyValues == 0 && parcel != null) {
                    recycleParcel(parcel);
                    mWeakParcelledData = null;
                }
            }