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

Commit 34dfaf4b authored by Hani Kazmi's avatar Hani Kazmi Committed by Automerger Merge Worker
Browse files

Merge "Synchronize on parcel for LazyValue methods" into udc-dev am: f49fad35 am: 15e7d236 

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



Change-Id: I030b88f048f8b18949b0a6a17344da00983230ef
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0615ac3b 15e7d236

core/java/android/os/Parcel.java

+17 −6
Original line number Diff line number Diff line
@@ -4499,17 +4499,28 @@ public final class Parcel { 
        public void writeToParcel(Parcel out) {

            Parcel source = mSource;

            if (source != null) {

                synchronized (source) {

                    if (mSource != null) {

                        out.appendFrom(source, mPosition, mLength);

            } else {

                out.writeValue(mObject);

                        return;

                    }

                }

            }



            out.writeValue(mObject);

        }



        public boolean hasFileDescriptors() {

            Parcel source = mSource;

            return (source != null)

                    ? source.hasFileDescriptors(mPosition, mLength)

                    : Parcel.hasFileDescriptors(mObject);

            if (source != null) {

                synchronized (source) {

                    if (mSource != null) {

                        return source.hasFileDescriptors(mPosition, mLength);

                    }

                }

            }



            return Parcel.hasFileDescriptors(mObject);

        }



        @Override