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

Commit 1238dc26 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: log debug server start/stop" am: 23f910cb am: 7878617f... 

Merge "libbinder: log debug server start/stop" am: 23f910cb am: 7878617f am: e8151aac am: 441ee377

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



Change-Id: Ifc4fb9eb5e3d9eef435a28398c4e1aa9e37f8baa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f576731 441ee377

libs/binder/Binder.cpp

+6 −6
Original line number Diff line number Diff line
@@ -232,7 +232,10 @@ public: 
          : mRpcServer(rpcServer), mKeepAliveBinder(keepAliveBinder), mBinder(binder) {}

    virtual ~RpcServerLink();

    void binderDied(const wp<IBinder>&) override {

        LOG_RPC_DETAIL("RpcServerLink: binder died, shutting down RpcServer");

        auto promoted = mBinder.promote();

        ALOGI("RpcBinder: binder died, shutting down RpcServer for %s",

              promoted ? String8(promoted->getInterfaceDescriptor()).c_str() : "<NULL>");



        if (mRpcServer == nullptr) {

            ALOGW("RpcServerLink: Unable to shut down RpcServer because it does not exist.");

        } else {
@@ -241,11 +244,7 @@ public: 
        }

        mRpcServer.clear();



        auto promoted = mBinder.promote();

        if (promoted == nullptr) {

            ALOGW("RpcServerLink: Unable to remove link from parent binder object because parent "

                  "binder object is gone.");

        } else {

        if (promoted) {

            promoted->removeRpcServerLink(sp<RpcServerLink>::fromExisting(this));

        }

        mBinder.clear();
@@ -706,6 +705,7 @@ status_t BBinder::setRpcClientDebug(android::base::unique_fd socketFd, 
        return status;

    }

    rpcServer->setMaxThreads(binderThreadPoolMaxCount);

    LOG(INFO) << "RpcBinder: Started Binder debug on " << getInterfaceDescriptor();

    rpcServer->start();

    e->mRpcServerLinks.emplace(link);

    LOG_RPC_DETAIL("%s(fd=%d) successful", __PRETTY_FUNCTION__, socketFdForPrint);