commit 4ce42a3de8feee9e967eeb16c6101855ef2f327a
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 14 00:06:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 14 00:06:12 2017 +0000
tree 66a8b12917542c46032a4daea703b08a463f2e82
parent 3570ba417038df0dc7502290cdb131a965be4465
parent cdeb057a5e0aae327ac7c2cdf0489830a0ca349f

Merge "wpa_supplicant.conf can be in either /system or /vendor"

libwifi_system/supplicant_manager.cpp

diff --git a/libwifi_system/supplicant_manager.cpp b/libwifi_system/supplicant_manager.cpp
index 833739a..00c403f 100644
--- a/libwifi_system/supplicant_manager.cpp
+++ b/libwifi_system/supplicant_manager.cpp
@@ -43,7 +43,7 @@
 
 const char kSupplicantInitProperty[] = "init.svc.wpa_supplicant";
 const char kSupplicantConfigTemplatePath[] =
-    "/system/etc/wifi/wpa_supplicant.conf";
+    "/etc/wifi/wpa_supplicant.conf";
 const char kSupplicantConfigFile[] = "/data/misc/wifi/wpa_supplicant.conf";
 const char kP2pConfigFile[] = "/data/misc/wifi/p2p_supplicant.conf";
 const char kSupplicantServiceName[] = "wpa_supplicant";
@@ -54,6 +54,7 @@
   int srcfd, destfd;
   int nread;
   int ret;
+  std::string templatePath;
 
   ret = access(config_file, R_OK | W_OK);
   if ((ret == 0) || (errno == EACCES)) {
@@ -69,11 +70,18 @@
     return false;
   }
 
-  srcfd = TEMP_FAILURE_RETRY(open(kSupplicantConfigTemplatePath, O_RDONLY));
+  templatePath = std::string("/system") + std::string(kSupplicantConfigTemplatePath);
+  srcfd = TEMP_FAILURE_RETRY(open(templatePath.c_str(), O_RDONLY));
   if (srcfd < 0) {
-    LOG(ERROR) << "Cannot open \"" << kSupplicantConfigTemplatePath << "\": "
+    LOG(ERROR) << "Cannot open \"" << templatePath << "\": "
                << strerror(errno);
-    return false;
+    templatePath = std::string("/vendor") + std::string(kSupplicantConfigTemplatePath);
+    srcfd = TEMP_FAILURE_RETRY(open(templatePath.c_str(), O_RDONLY));
+    if (srcfd < 0) {
+      LOG(ERROR) << "Cannot open \"" << templatePath << "\": "
+                 << strerror(errno);
+      return false;
+    }
   }
 
   destfd = TEMP_FAILURE_RETRY(open(config_file,
@@ -88,7 +96,7 @@
 
   while ((nread = TEMP_FAILURE_RETRY(read(srcfd, buf, sizeof(buf)))) != 0) {
     if (nread < 0) {
-      LOG(ERROR) << "Error reading \"" << kSupplicantConfigTemplatePath
+      LOG(ERROR) << "Error reading \"" << templatePath
                  << "\": " << strerror(errno);
       close(srcfd);
       close(destfd);