Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74ecab53 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Merge "[RpcSession] Add checks before setting SessionSpecificRoot" into main... 

Merge "[RpcSession] Add checks before setting SessionSpecificRoot" into main am: 7bbb4840 am: 57bbde45

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3185239



Change-Id: Id9542c1e6d0968a3f06f417b36ef827a25419095
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab12e9d1 57bbde45

libs/binder/RpcSession.cpp

+4 −0
Original line number Diff line number Diff line
@@ -802,6 +802,10 @@ bool RpcSession::setForServer(const wp<RpcServer>& server, const wp<EventListene 
}



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;

}