commit c4c2a36bed560cf63e5139e21416661ce6cc7d10
author Tom Cherry <tomcherry@google.com> Fri Mar 24 02:00:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 24 02:00:38 2017 +0000
tree b5fba8d359f37a6feb2461c371ea3b50fa679193
parent 79ba7c7ece7f43cd5f6b4023deba47e26736e101
parent a6419576892396ad227cc300c69ea9fcae74a970

Merge "init: Remove superfluous error check" am: 186edb1aef am: 4f117206a8
am: 851c379bb0

Change-Id: I1e4f8f2215644b679854f1b644e44b5a2fbd7f9a

init/service.cpp

diff --git a/init/service.cpp b/init/service.cpp
index 35aaa56..c8d1cb1 100644
--- a/init/service.cpp
+++ b/init/service.cpp
@@ -889,15 +889,10 @@
         }
     }
 
-    std::unique_ptr<Service> svc_p(new Service(name, "default", flags, uid, gid, supp_gids,
-                                               no_capabilities, namespace_flags, seclabel,
-                                               str_args));
-    if (!svc_p) {
-        LOG(ERROR) << "Couldn't allocate service for exec of '" << str_args[0] << "'";
-        return nullptr;
-    }
+    auto svc_p = std::make_unique<Service>(name, "default", flags, uid, gid, supp_gids,
+                                           no_capabilities, namespace_flags, seclabel, str_args);
     Service* svc = svc_p.get();
-    services_.push_back(std::move(svc_p));
+    services_.emplace_back(std::move(svc_p));
 
     return svc;
 }