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

Commit 5de63715 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I914fa057,I89ad4e2e am: b84297d9 

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



Change-Id: Iaf737e86f8332456b21b484807a666201fd23b40
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3a976d6 b84297d9

libs/binder/RpcState.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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) {

libs/binder/include/binder/IPCThreadState.h

+4 −0
Original line number Diff line number Diff line
@@ -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:

libs/binder/include/binder/ProcessState.h

+4 −0
Original line number Diff line number Diff line
@@ -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();