summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author Chavi Weingarten <chaviw@google.com> 2021-08-10 16:03:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-10 16:03:34 +0000
commit7aaabba1a0f900f9177478bbc9ef7181710a0850 (patch)
tree8f89541d3a69b95afcf0ebda2f05512738c4e7ac /libs/gui/LayerState.cpp
parenteb681a4ca6a50df0a2afb1ae1b748c3d7c0df078 (diff)
parent33900bf3b1300e8f04c60101fb57c53b661b3d41 (diff)
Merge "Send releaseCallbackId and releaseFence to correct listener" into sc-v2-dev am: 9ea0a76757 am: 33900bf3b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15479241 Change-Id: I43a3d12ed616dcfd4a2a283179fcd7b725fc1a66
Diffstat (limited to 'libs/gui/LayerState.cpp')
-rw-r--r--libs/gui/LayerState.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/gui/LayerState.cpp b/libs/gui/LayerState.cpp
index 23895c0c9f..2922ce9542 100644
--- a/libs/gui/LayerState.cpp
+++ b/libs/gui/LayerState.cpp
@@ -174,6 +174,7 @@ status_t layer_state_t::write(Parcel& output) const
SAFE_PARCEL(output.write, destinationFrame);
SAFE_PARCEL(output.writeBool, isTrustedOverlay);
+ SAFE_PARCEL(output.writeStrongBinder, releaseBufferEndpoint);
return NO_ERROR;
}
@@ -303,6 +304,7 @@ status_t layer_state_t::read(const Parcel& input)
SAFE_PARCEL(input.read, destinationFrame);
SAFE_PARCEL(input.readBool, &isTrustedOverlay);
+ SAFE_PARCEL(input.readNullableStrongBinder, &releaseBufferEndpoint);
return NO_ERROR;
}