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

Commit 47413282 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: setupPolling flushes commands" am: b86f8920 am: c8e80ed7 am: 77c4d2d0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I143c9d5ba12370af935d20f4de9a29f1a5277df2
parents 36ae46e0 77c4d2d0

cmds/servicemanager/main.cpp

+0 −4
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@ public: 
        IPCThreadState::self()->setupPolling(&binder_fd);

        LOG_ALWAYS_FATAL_IF(binder_fd < 0, "Failed to setupPolling: %d", binder_fd);



        // Flush after setupPolling(), to make sure the binder driver

        // knows about this thread handling commands.

        IPCThreadState::self()->flushCommands();



        int ret = looper->addFd(binder_fd,

                                Looper::POLL_CALLBACK,

                                Looper::EVENT_INPUT,

libs/binder/IPCThreadState.cpp

+1 −0
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ status_t IPCThreadState::setupPolling(int* fd) 
    }



    mOut.writeInt32(BC_ENTER_LOOPER);

    flushCommands();

    *fd = mProcess->mDriverFD;

    return 0;

}