summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-15 15:54:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-15 15:54:31 +0000
commit619693476ec7b9dcbfbf197737f1b1638d1cd199 (patch)
treede1ad360c012484101dcf8ec1ca18d8b75324404
parent706ca6ce2d939c02b4813947a397bf7a290f96ab (diff)
parentb0b13eab17ba781d417ad25bc7166410adbae2c6 (diff)
downloadandroid_frameworks_opt_net_wifi-619693476ec7b9dcbfbf197737f1b1638d1cd199.tar.gz
android_frameworks_opt_net_wifi-619693476ec7b9dcbfbf197737f1b1638d1cd199.tar.bz2
android_frameworks_opt_net_wifi-619693476ec7b9dcbfbf197737f1b1638d1cd199.zip
Merge "Improve logging for supplicant config file" into oc-dev
-rw-r--r--libwifi_system/supplicant_manager.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/libwifi_system/supplicant_manager.cpp b/libwifi_system/supplicant_manager.cpp
index d115dc1e7..28010ec8d 100644
--- a/libwifi_system/supplicant_manager.cpp
+++ b/libwifi_system/supplicant_manager.cpp
@@ -67,16 +67,22 @@ int ensure_config_file_exists(const char* config_file) {
return false;
}
- templatePath = std::string("/system") + std::string(kSupplicantConfigTemplatePath);
- srcfd = TEMP_FAILURE_RETRY(open(templatePath.c_str(), O_RDONLY));
+ std::string configPathSystem =
+ std::string("/system") + std::string(kSupplicantConfigTemplatePath);
+ std::string configPathVendor =
+ std::string("/vendor") + std::string(kSupplicantConfigTemplatePath);
+ srcfd = TEMP_FAILURE_RETRY(open(configPathSystem.c_str(), O_RDONLY));
+ templatePath = configPathSystem;
if (srcfd < 0) {
- LOG(ERROR) << "Cannot open \"" << templatePath << "\": "
- << strerror(errno);
- templatePath = std::string("/vendor") + std::string(kSupplicantConfigTemplatePath);
- srcfd = TEMP_FAILURE_RETRY(open(templatePath.c_str(), O_RDONLY));
+ int errnoSystem = errno;
+ srcfd = TEMP_FAILURE_RETRY(open(configPathVendor.c_str(), O_RDONLY));
+ templatePath = configPathVendor;
if (srcfd < 0) {
- LOG(ERROR) << "Cannot open \"" << templatePath << "\": "
- << strerror(errno);
+ int errnoVendor = errno;
+ LOG(ERROR) << "Cannot open \"" << configPathSystem << "\": "
+ << strerror(errnoSystem);
+ LOG(ERROR) << "Cannot open \"" << configPathVendor << "\": "
+ << strerror(errnoVendor);
return false;
}
}