summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Buckley <mattbuckley@google.com> 2023-08-30 21:00:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-30 21:00:53 +0000
commit16b389969428194d3817bcf7edd0670ed5eec21f (patch)
tree2d6dc08590976bef412391115a249bed4f443e22
parent7e97c4446477f5f39fedea56cc41507d25d9ce11 (diff)
parent55d091974bb3d02b228581cb698162067c3090f0 (diff)
Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191cc am: 55d091974b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24592263 Change-Id: I8c37e4a6e10ec93eda8e6ae7d0c96c32d13dae61 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/hwui/renderthread/HintSessionWrapper.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/HintSessionWrapper.cpp b/libs/hwui/renderthread/HintSessionWrapper.cpp
index 814ac4d90028..30e472a79926 100644
--- a/libs/hwui/renderthread/HintSessionWrapper.cpp
+++ b/libs/hwui/renderthread/HintSessionWrapper.cpp
@@ -93,8 +93,13 @@ HintSessionWrapper::HintSessionWrapper(pid_t uiThreadId, pid_t renderThreadId)
: mUiThreadId(uiThreadId), mRenderThreadId(renderThreadId) {}
HintSessionWrapper::~HintSessionWrapper() {
+ if (mHintSessionFuture.valid()) {
+ mHintSession = mHintSessionFuture.get();
+ }
if (mHintSession) {
gAPH_closeSessionFn(mHintSession);
+ mSessionValid = true;
+ mHintSession = nullptr;
}
}