Merge "[RpcSession] Add checks before setting SessionSpecificRoot" into main am: 7bbb484092
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3185239
Change-Id: If784e55228f9e1db070f72e3568799a84bd4afb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/RpcSession.cpp b/libs/binder/RpcSession.cpp
index 21dc5c1..49def82 100644
--- a/libs/binder/RpcSession.cpp
+++ b/libs/binder/RpcSession.cpp
@@ -802,6 +802,10 @@
}
void RpcSession::setSessionSpecificRoot(const sp<IBinder>& sessionSpecificRoot) {
+ LOG_ALWAYS_FATAL_IF(mSessionSpecificRootObject != nullptr,
+ "Session specific root object already set");
+ LOG_ALWAYS_FATAL_IF(mForServer != nullptr,
+ "Session specific root object cannot be set for a server");
mSessionSpecificRootObject = sessionSpecificRoot;
}