Merge "Revert "Use new netlink attribute for scan result timestamp" am: ecb6bb205f...

[android-x86/system-connectivity-wificond.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index d929f76..6e3f1d7 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -28,8 +28,6 @@
 #include <cutils/properties.h>
 #include <libminijail.h>
 #include <utils/String16.h>
-#include <wifi_hal/driver_tool.h>
-#include <wifi_system/hal_tool.h>
 #include <wifi_system/interface_tool.h>
 
 #include "wificond/ipc_constants.h"
@@ -40,13 +38,9 @@
 #include "wificond/server.h"
 
 using android::net::wifi::IWificond;
-using android::wifi_hal::DriverTool;
-using android::wifi_system::HalTool;
 using android::wifi_system::HostapdManager;
 using android::wifi_system::InterfaceTool;
 using android::wifi_system::SupplicantManager;
-using android::wificond::ipc_constants::kDevModePropertyKey;
-using android::wificond::ipc_constants::kDevModeServiceName;
 using android::wificond::ipc_constants::kServiceName;
 using std::unique_ptr;
 
@@ -99,27 +93,10 @@ void RegisterServiceOrCrash(const android::sp<android::IBinder>& service) {
   android::sp<android::IServiceManager> sm = android::defaultServiceManager();
   CHECK_EQ(sm != NULL, true) << "Could not obtain IServiceManager";
 
-  const int8_t dev_mode_on = property_get_bool(kDevModePropertyKey, 0);
-  const char* service_name = (dev_mode_on) ? kDevModeServiceName : kServiceName;
-  CHECK_EQ(sm->addService(android::String16(service_name), service),
+  CHECK_EQ(sm->addService(android::String16(kServiceName), service),
            android::NO_ERROR);
 }
 
-void DoPrivilegedSetupOrCrash() {
-  CHECK(DriverTool::TakeOwnershipOfFirmwareReload());
-}
-
-void DropPrivilegesOrCrash() {
-  minijail* j = minijail_new();
-  CHECK(minijail_change_user(j, "wifi") == 0);
-  CHECK(minijail_change_group(j, "wifi") == 0);
-  minijail_use_caps(j,
-                    CAP_TO_MASK(CAP_NET_ADMIN) |
-                    CAP_TO_MASK(CAP_NET_RAW));
-  minijail_enter(j);
-  minijail_destroy(j);
-}
-
 }  // namespace
 
 void OnBinderReadReady(int fd) {
@@ -130,9 +107,6 @@ int main(int argc, char** argv) {
   android::base::InitLogging(argv, android::base::LogdLogger(android::base::SYSTEM));
   LOG(INFO) << "wificond is starting up...";
 
-  DoPrivilegedSetupOrCrash();
-  DropPrivilegesOrCrash();
-
   unique_ptr<android::wificond::LooperBackedEventLoop> event_dispatcher(
       new android::wificond::LooperBackedEventLoop());
   ScopedSignalHandler scoped_signal_handler(event_dispatcher.get());
@@ -149,9 +123,7 @@ int main(int argc, char** argv) {
   android::wificond::ScanUtils scan_utils(&netlink_manager);
 
   unique_ptr<android::wificond::Server> server(new android::wificond::Server(
-      unique_ptr<HalTool>(new HalTool),
       unique_ptr<InterfaceTool>(new InterfaceTool),
-      unique_ptr<DriverTool>(new DriverTool),
       unique_ptr<SupplicantManager>(new SupplicantManager()),
       unique_ptr<HostapdManager>(new HostapdManager()),
       &netlink_utils,