ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Remove binder dependency in init."

Browse source
This commit is contained in:
Steven Moreland 2019-07-11 20:56:12 +00:00 • committed by Gerrit Code Review
commit 4280165ae0
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
init/Android.bp
View file

@ -74,7 +74,6 @@ cc_defaults {
shared_libs: [ shared_libs: [
"libbacktrace", "libbacktrace",
"libbase", "libbase",
"libbinder",
"libbootloader_message", "libbootloader_message",
"libcutils", "libcutils",
"libcrypto", "libcrypto",

25
init/init.cpp
View file

@ -50,10 +50,6 @@
#include <processgroup/setup.h> #include <processgroup/setup.h>
#include <selinux/android.h> #include <selinux/android.h>
#ifndef RECOVERY
#include <binder/ProcessState.h>
#endif
#include "action_parser.h" #include "action_parser.h"
#include "boringssl_self_test.h" #include "boringssl_self_test.h"
#include "builtins.h" #include "builtins.h"
@ -453,24 +449,6 @@ static Result<void> queue_property_triggers_action(const BuiltinArguments& args)
return {}; return {};
} }
static Result<void> InitBinder(const BuiltinArguments& args) {
// init's use of binder is very limited. init cannot:
// - have any binder threads
// - receive incoming binder calls
// - pass local binder services to remote processes
// - use death recipients
// The main supported usecases are:
// - notifying other daemons (oneway calls only)
// - retrieving data that is necessary to boot
// Also, binder can't be used by recovery.
#ifndef RECOVERY
android::ProcessState::self()->setThreadPoolMaxThreadCount(0);
android::ProcessState::self()->setCallRestriction(
ProcessState::CallRestriction::ERROR_IF_NOT_ONEWAY);
#endif
return {};
}
// Set the UDC controller for the ConfigFS USB Gadgets. // Set the UDC controller for the ConfigFS USB Gadgets.
// Read the UDC controller in use from "/sys/class/udc". // Read the UDC controller in use from "/sys/class/udc".
// In case of multiple UDC controllers select the first one. // In case of multiple UDC controllers select the first one.
@ -766,9 +744,6 @@ int SecondStageMain(int argc, char** argv) {
// wasn't ready immediately after wait_for_coldboot_done // wasn't ready immediately after wait_for_coldboot_done
am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng"); am.QueueBuiltinAction(MixHwrngIntoLinuxRngAction, "MixHwrngIntoLinuxRng");
// Initialize binder before bringing up other system services
am.QueueBuiltinAction(InitBinder, "InitBinder");
// Don't mount filesystems or start core system services in charger mode. // Don't mount filesystems or start core system services in charger mode.
std::string bootmode = GetProperty("ro.bootmode", ""); std::string bootmode = GetProperty("ro.bootmode", "");
if (bootmode == "charger") { if (bootmode == "charger") {