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

Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e am: 11fc5ee64d

Browse source 
Change-Id: Ie11d72a6c27a8c5f509fb36adc44ec67b4d8e0d6
This commit is contained in:
Treehugger Robot 2020-05-14 19:44:58 +00:00 • committed by Automerger Merge Worker
commit 1ec5cffd71
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
init/init.cpp
View file

@ -537,7 +537,9 @@ static Result<void> queue_property_triggers_action(const BuiltinArguments& args)
// 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.
static void set_usb_controller() { static void SetUsbController() {
static auto controller_set = false;
if (controller_set) return;
std::unique_ptr<DIR, decltype(&closedir)>dir(opendir("/sys/class/udc"), closedir); std::unique_ptr<DIR, decltype(&closedir)>dir(opendir("/sys/class/udc"), closedir);
if (!dir) return; if (!dir) return;
@ -546,6 +548,7 @@ static void set_usb_controller() {
if (dp->d_name[0] == '.') continue; if (dp->d_name[0] == '.') continue;
SetProperty("sys.usb.controller", dp->d_name); SetProperty("sys.usb.controller", dp->d_name);
controller_set = true;
break; break;
} }
} }
@ -800,7 +803,7 @@ int SecondStageMain(int argc, char** argv) {
fs_mgr_vendor_overlay_mount_all(); fs_mgr_vendor_overlay_mount_all();
export_oem_lock_status(); export_oem_lock_status();
MountHandler mount_handler(&epoll); MountHandler mount_handler(&epoll);
set_usb_controller(); SetUsbController();
const BuiltinFunctionMap& function_map = GetBuiltinFunctionMap(); const BuiltinFunctionMap& function_map = GetBuiltinFunctionMap();
Action::set_function_map(&function_map); Action::set_function_map(&function_map);
@ -910,6 +913,7 @@ int SecondStageMain(int argc, char** argv) {
} }
if (!IsShuttingDown()) { if (!IsShuttingDown()) {
HandleControlMessages(); HandleControlMessages();
SetUsbController();
} }
} }