summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNingyuan Wang2017-07-19 17:30:37 -0500
committerNingyuan Wang2017-07-19 17:48:53 -0500
commitaf01f9f2cd9f642b77699ea82a753e5d0895b7ac (patch)
tree6fba99a12cee8a1d3f776698119a62ae768fc10d
parentcef3c972fb2ac526389b625e9d257df4cd0eb258 (diff)
downloadsystem-connectivity-wificond-af01f9f2cd9f642b77699ea82a753e5d0895b7ac.tar.gz
system-connectivity-wificond-af01f9f2cd9f642b77699ea82a753e5d0895b7ac.tar.xz
system-connectivity-wificond-af01f9f2cd9f642b77699ea82a753e5d0895b7ac.zip
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
-rw-r--r--main.cpp4
1 files changed, 3 insertions, 1 deletions
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) {
139 &OnHwBinderReadReady)) << "Failed to watch Hw Binder FD"; 139 &OnHwBinderReadReady)) << "Failed to watch Hw Binder FD";
140 140
141 android::wificond::NetlinkManager netlink_manager(event_dispatcher.get()); 141 android::wificond::NetlinkManager netlink_manager(event_dispatcher.get());
142 CHECK(netlink_manager.Start()) << "Failed to start netlink manager"; 142 if (!netlink_manager.Start()) {
143 LOG(ERROR) << "Failed to start netlink manager";
144 }
143 android::wificond::NetlinkUtils netlink_utils(&netlink_manager); 145 android::wificond::NetlinkUtils netlink_utils(&netlink_manager);
144 android::wificond::ScanUtils scan_utils(&netlink_manager); 146 android::wificond::ScanUtils scan_utils(&netlink_manager);
145 147