From 2a4594ec5e21af42112b2d95e90749e20f084937 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Mon, 28 Dec 2020 17:29:20 -0800 Subject: [PATCH] Add the missing call to write mInputToken in SurfacePackage to parcel ag/12396996 introduces mInputToken, but it's only added to parcel reading. It has thus caused a bug (parcel reading misalignment) in the Wallpaper app as in our preview feature we passes a SurfacePackage over from Launcher. Test: manual Fixes: 176248059 Change-Id: Ife46d6d67991964d63513c946318cffbaf4ffae9 --- core/java/android/view/SurfaceControlViewHost.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/java/android/view/SurfaceControlViewHost.java b/core/java/android/view/SurfaceControlViewHost.java index 4d1faf79273f4..f019648228978 100644 --- a/core/java/android/view/SurfaceControlViewHost.java +++ b/core/java/android/view/SurfaceControlViewHost.java @@ -115,6 +115,7 @@ public class SurfaceControlViewHost { public void writeToParcel(@NonNull Parcel out, int flags) { mSurfaceControl.writeToParcel(out, flags); out.writeStrongBinder(mAccessibilityEmbeddedConnection.asBinder()); + out.writeStrongBinder(mInputToken); } /**