commit 5ab7f53cbd9fa683dc21a6d7a92608cc4cdf64e5
author Daisuke Niwa <daisuke.x.niwa@sonymobile.com> Thu Oct 05 00:53:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 05 00:53:34 2017 +0000
tree 22900057536cc80b7d4a60f73f7c7594d0dc0799
parent e57b9f8e86cbbf144326dc7b86db7aca2b05609e
parent dc24ed7ffb0f1fae19b52c60ecfe9e801255e4e2

Remove hostapd.conf before starting Tethering
am: dc24ed7ffb

Change-Id: I06bcd9c340231fa716860577763e00c432df705a

libwifi_system/hostapd_manager.cpp

diff --git a/libwifi_system/hostapd_manager.cpp b/libwifi_system/hostapd_manager.cpp
index 68184e9..658eecd 100644
--- a/libwifi_system/hostapd_manager.cpp
+++ b/libwifi_system/hostapd_manager.cpp
@@ -34,6 +34,7 @@
 
 using android::base::ParseInt;
 using android::base::ReadFileToString;
+using android::base::RemoveFileIfExists;
 using android::base::StringPrintf;
 using android::base::WriteStringToFile;
 using std::string;
@@ -103,6 +104,9 @@
 }
 
 bool HostapdManager::WriteHostapdConfig(const string& config) {
+  // Remove hostapd.conf because its file owner might be system
+  // in previous OS and chmod fails in that case.
+  RemoveFileIfExists(kHostapdConfigFilePath);
   if (!WriteStringToFile(config, kHostapdConfigFilePath,
                          S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
                          AID_WIFI, AID_WIFI)) {