summaryrefslogtreecommitdiff
path: root/libs/binder/RpcSession.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2022-06-10 19:43:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-10 19:43:53 +0000
commitce20f7fa151001d5d528c34243aa0114b31d15bc (patch)
tree4264d7857300a6ae2090983c781e72450c1af724 /libs/binder/RpcSession.cpp
parent83562e55fb1998bb170a90a591fbe6228eb02756 (diff)
parentece70230826f0f1e868c9a9d22c7cf9ca27de2c0 (diff)
Merge changes Ie9fa8c9c,I9773a4cf am: ece7023082
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2095306 Change-Id: I0698d14f8b1009d4416e49977dc45ebf2b091c57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/binder/RpcSession.cpp')
-rw-r--r--libs/binder/RpcSession.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 5c35dd0ac1..8edc78f2f5 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -715,6 +715,7 @@ bool RpcSession::setForServer(const wp<RpcServer>& server, const wp<EventListene
LOG_ALWAYS_FATAL_IF(mEventListener != nullptr);
LOG_ALWAYS_FATAL_IF(eventListener == nullptr);
LOG_ALWAYS_FATAL_IF(mShutdownTrigger != nullptr);
+ LOG_ALWAYS_FATAL_IF(mCtx != nullptr);
mShutdownTrigger = FdTrigger::make();
if (mShutdownTrigger == nullptr) return false;