diff options
| author | 2022-07-07 00:27:39 +0000 | |
|---|---|---|
| committer | 2022-07-07 00:27:39 +0000 | |
| commit | 6004b4172d1c0d797b097dc4da5639391480d466 (patch) | |
| tree | 7999272b985d5eb3076cc6b938a9e01e18c48ecf | |
| parent | 269cce6cc711305ea96ede143f28258d8f3c157f (diff) | |
| parent | 5de637151d1e3a92435042272bf35513545ee8b3 (diff) | |
Merge changes I914fa057,I89ad4e2e am: b84297d910 am: 5de637151d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2147381
Change-Id: I366ee8b2f07aa524beec2ff25f9af7781d20010c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/RpcState.cpp | 3 | ||||
| -rw-r--r-- | libs/binder/include/binder/IPCThreadState.h | 4 | ||||
| -rw-r--r-- | libs/binder/include/binder/ProcessState.h | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/libs/binder/RpcState.cpp b/libs/binder/RpcState.cpp index bde3d90d90..0ae75cdefa 100644 --- a/libs/binder/RpcState.cpp +++ b/libs/binder/RpcState.cpp @@ -736,7 +736,8 @@ status_t RpcState::processCommand( IPCThreadState* kernelBinderState = IPCThreadState::selfOrNull(); IPCThreadState::SpGuard spGuard{ .address = __builtin_frame_address(0), - .context = "processing binder RPC command", + .context = "processing binder RPC command (where RpcServer::setPerSessionRootObject is " + "used to distinguish callers)", }; const IPCThreadState::SpGuard* origGuard; if (kernelBinderState != nullptr) { diff --git a/libs/binder/include/binder/IPCThreadState.h b/libs/binder/include/binder/IPCThreadState.h index cd6a27414d..8ce3bc9dc9 100644 --- a/libs/binder/include/binder/IPCThreadState.h +++ b/libs/binder/include/binder/IPCThreadState.h @@ -28,6 +28,10 @@ typedef int uid_t; // --------------------------------------------------------------------------- namespace android { +/** + * Kernel binder thread state. All operations here refer to kernel binder. This + * object is allocated per-thread. + */ class IPCThreadState { public: diff --git a/libs/binder/include/binder/ProcessState.h b/libs/binder/include/binder/ProcessState.h index e17a76cf23..882dfbf0fa 100644 --- a/libs/binder/include/binder/ProcessState.h +++ b/libs/binder/include/binder/ProcessState.h @@ -29,6 +29,10 @@ namespace android { class IPCThreadState; +/** + * Kernel binder process state. All operations here refer to kernel binder. This + * object is allocated per process. + */ class ProcessState : public virtual RefBase { public: static sp<ProcessState> self(); |