commit 77c4d2d07ba3b9edfb0945199b0e2074d0546ef2
author Steven Moreland <smoreland@google.com> Tue Jan 19 17:43:08 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 19 17:43:08 2021 +0000
tree 7489be1827d19ae732a35e52c83064dc6b860073
parent e25f600ca1ee1439e236bf31eb4a237fc476c7f5
parent c8e80ed794bccb05fca71e833a221426574967ce

Merge "libbinder: setupPolling flushes commands" am: b86f892039 am: c8e80ed794

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9cd924a82a8240b57e1704888bd97af68852e2f7

cmds/servicemanager/main.cpp

diff --git a/cmds/servicemanager/main.cpp b/cmds/servicemanager/main.cpp
index b1bc6dc..627dfe6 100644
--- a/cmds/servicemanager/main.cpp
+++ b/cmds/servicemanager/main.cpp
@@ -45,10 +45,6 @@
         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

diff --git a/libs/binder/IPCThreadState.cpp b/libs/binder/IPCThreadState.cpp
index 7d01e0b..2eee2c4 100644
--- a/libs/binder/IPCThreadState.cpp
+++ b/libs/binder/IPCThreadState.cpp
@@ -629,6 +629,7 @@
     }
 
     mOut.writeInt32(BC_ENTER_LOOPER);
+    flushCommands();
     *fd = mProcess->mDriverFD;
     return 0;
 }