Snap for 7080740 from d196b3dd6e3fc303604ae33933b0723c77cb6322 to mainline-resolv-release

Change-Id: If46a5d9b23e395b75332fc881f5f38a76935c532
diff --git a/main.cpp b/main.cpp
index e5e41aa..0c17edf 100644
--- a/main.cpp
+++ b/main.cpp
@@ -124,11 +124,11 @@
   android::wificond::NetlinkUtils netlink_utils(&netlink_manager);
   android::wificond::ScanUtils scan_utils(&netlink_manager);
 
-  unique_ptr<android::wificond::Server> server(new android::wificond::Server(
+  android::sp<android::wificond::Server> server(new android::wificond::Server(
       unique_ptr<InterfaceTool>(new InterfaceTool),
       &netlink_utils,
       &scan_utils));
-  RegisterServiceOrCrash(server.get());
+  RegisterServiceOrCrash(server);
 
   WifiKeystoreHalConnector keystore_connector;
   keystore_connector.start();