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

Commit 072c35ce authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge changes I9fabf092,I70faf816 into main 

* changes:
  libbinder: stopProcess: directly stop process
  libbinder: unused-result warning
parents c09f9fa2 21eb774d

libs/binder/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ cc_defaults { 
        "-Wzero-as-null-pointer-constant",

        "-Wreorder-init-list",

        "-Wunused-const-variable",

        "-Wunused-result",

        "-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

        "-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",

        // Hide symbols by default and set the BUILDING_LIBBINDER macro so that

libs/binder/IPCThreadState.cpp

+27 −10
Original line number Diff line number Diff line
@@ -626,12 +626,22 @@ void IPCThreadState::flushCommands() 
{

    if (mProcess->mDriverFD < 0)

        return;

    talkWithDriver(false);



    if (status_t res = talkWithDriver(false); res != OK) {

        // TODO: we may want to abort for some of these cases

        ALOGW("1st call to talkWithDriver returned error in flushCommands: %s",

              statusToString(res).c_str());

    }



    // The flush could have caused post-write refcount decrements to have

    // been executed, which in turn could result in BC_RELEASE/BC_DECREFS

    // being queued in mOut. So flush again, if we need to.

    if (mOut.dataSize() > 0) {

        talkWithDriver(false);

        if (status_t res = talkWithDriver(false); res != OK) {

            // TODO: we may want to abort for some of these cases

            ALOGW("2nd call to talkWithDriver returned error in flushCommands: %s",

                  statusToString(res).c_str());

        }

    }

    if (mOut.dataSize() > 0) {

        ALOGW("mOut.dataSize() > 0 after flushCommands()");
@@ -803,7 +813,11 @@ void IPCThreadState::joinThreadPool(bool isMain) 


    mOut.writeInt32(BC_EXIT_LOOPER);

    mIsLooper = false;

    talkWithDriver(false);

    if (status_t res = talkWithDriver(false); res != OK) {

        // TODO: we may want to abort for some of these cases

        ALOGW("call to talkWithDriver in joinThreadPool returned error: %s, FD: %d",

              statusToString(res).c_str(), mProcess->mDriverFD);

    }

    size_t oldCount = mProcess->mCurrentThreads.fetch_sub(1);

    LOG_ALWAYS_FATAL_IF(oldCount == 0,

                        "Threadpool thread count underflowed. Thread cannot exist and exit in "
@@ -839,12 +853,8 @@ status_t IPCThreadState::handlePolledCommands() 


void IPCThreadState::stopProcess(bool /*immediate*/)

{

    //ALOGI("**** STOPPING PROCESS");

    flushCommands();

    int fd = mProcess->mDriverFD;

    mProcess->mDriverFD = -1;

    close(fd);

    //kill(getpid(), SIGKILL);

    ALOGI("IPCThreadState::stopProcess() (deprecated) called. Exiting process.");

    exit(0);

}



status_t IPCThreadState::transact(int32_t handle,
@@ -1494,7 +1504,14 @@ status_t IPCThreadState::executeCommand(int32_t cmd) 
                buffer.setDataSize(0);



                constexpr uint32_t kForwardReplyFlags = TF_CLEAR_BUF;

                sendReply(reply, (tr.flags & kForwardReplyFlags));



                // TODO: we may want to abort if there is an error here, or return as 'error'

                // from this function, but the impact needs to be measured

                status_t error2 = sendReply(reply, (tr.flags & kForwardReplyFlags));

                if (error2 != OK) {

                    ALOGE("error in sendReply for synchronous call: %s",

                          statusToString(error2).c_str());

                }

            } else {

                if (error != OK) {

                    std::ostringstream logStream;