From af01f9f2cd9f642b77699ea82a753e5d0895b7ac Mon Sep 17 00:00:00 2001 From: Ningyuan Wang Date: Wed, 19 Jul 2017 15:30:37 -0700 Subject: [PATCH] Do not crash on netlink manager start error For some device(emulator) kernel netlink interface is not configured. NetlinkManager.Start() will fail and crash wificond. Wificond is included in base.mk so it is not feasible to remove it from emulator image. This patch changes the error level from FATAL to ERROR to avoid crashing. Bug: 63837784 Test: compile, manual test wificond works Change-Id: I0cf3f6a1ea73e455f8362870e4c96c76b59dd41c --- main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index d2a9ba4..50e8d67 100644 --- a/main.cpp +++ b/main.cpp @@ -139,7 +139,9 @@ int main(int argc, char** argv) { &OnHwBinderReadReady)) << "Failed to watch Hw Binder FD"; android::wificond::NetlinkManager netlink_manager(event_dispatcher.get()); - CHECK(netlink_manager.Start()) << "Failed to start netlink manager"; + if (!netlink_manager.Start()) { + LOG(ERROR) << "Failed to start netlink manager"; + } android::wificond::NetlinkUtils netlink_utils(&netlink_manager); android::wificond::ScanUtils scan_utils(&netlink_manager); -- 2.11.0