Merge "Synchronize on parcel for LazyValue methods" into udc-dev (f49fad35) · Commits · e / os / android_frameworks_base

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