summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Buckley <mattbuckley@google.com> 2023-08-30 20:03:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-08-30 20:03:57 +0000
commit961a331d0287d0e5ebf8c1c03de5332d777a7a6c (patch)
tree2eb05ff0a3addd6fab2c52de4f83e6d93ef99522
parent5d37d133c4dbcfdebf35adaf3dce26c51ccdb43d (diff)
parenta7a99191cc3904807368c275c69bc75bed7fef76 (diff)
Merge "Fix possible leaks in CanvasContext HintSessionWrapper" into udc-dev am: a7a99191cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24592263 Change-Id: I5e8d53ce3d3728492a2f3a8572952edf65027a00 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;
}
}