commit 730b6cfbc1769780f3c357dd3c299cff470b02ad
author Bernardo Rufino <brufino@google.com> Thu Sep 09 09:48:13 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 09 09:48:13 2021 +0000
tree a8d557e93f4b396216af1d5705956e812081500c
parent 2823967c2dba4eb200c30b7b07dcb5af452737de
parent 5e5d77690644a80d2ba44bd5fdbc6555b9e02bfd

Merge "Use appendFrom in LazyValue.writeToParcel()"

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index d23b219..a2716d2 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -3445,15 +3445,7 @@
 
         public void writeToParcel(Parcel out) {
             if (mObject == null) {
-                int restore = mSource.dataPosition();
-                try {
-                    mSource.setDataPosition(mPosition);
-                    out.writeInt(mSource.readInt()); // Type
-                    out.writeInt(mSource.readInt()); // Length
-                    out.appendFrom(mSource, mSource.dataPosition(), mLength);
-                } finally {
-                    mSource.setDataPosition(restore);
-                }
+                out.appendFrom(mSource, mPosition, mLength + 8);
             } else {
                 out.writeValue(mObject);
             }