commit 62729eea877bdce41dc4341072422664b95c3f26
author Steven Moreland <smoreland@google.com> Thu Mar 21 15:48:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 21 15:48:38 2019 -0700
tree e493b25922e981da28c2dfff512e63a8e60608fb
parent dd589d07e0439abd7c0f304ce457fa90df0078f8
parent 2137299e956658a73765a493204b4b44edfd10fb

Log for duplicate service registration. am: d90d9f2bc9
am: 2137299e95

Change-Id: I5a6645bc9ca82cd1f8844c164b8f3700a56d722f

service.cpp

diff --git a/service.cpp b/service.cpp
index 9dd1aee..c7c2a95 100644
--- a/service.cpp
+++ b/service.cpp
@@ -50,8 +50,6 @@
 // libhidl
 using android::hardware::handleTransportPoll;
 using android::hardware::setRequestingSid;
-using android::hardware::HidlReturnRestriction;
-using android::hardware::setProcessHidlReturnRestriction;
 using android::hardware::setupTransportPolling;
 using android::hardware::toBinder;
 
@@ -139,19 +137,15 @@
 };
 
 int main() {
-    // If hwservicemanager crashes, the system may be unstable and hard to debug. This is both why
-    // we log this and why we care about this at all.
-    setProcessHidlReturnRestriction(HidlReturnRestriction::ERROR_IF_UNCHECKED);
-
     sp<ServiceManager> manager = new ServiceManager();
     setRequestingSid(manager, true);
 
-    if (!manager->add(serviceName, manager).withDefault(false)) {
+    if (!manager->add(serviceName, manager)) {
         ALOGE("Failed to register hwservicemanager with itself.");
     }
 
     sp<TokenManager> tokenManager = new TokenManager();
-    if (!manager->add(serviceName, tokenManager).withDefault(false)) {
+    if (!manager->add(serviceName, tokenManager)) {
         ALOGE("Failed to register ITokenManager with hwservicemanager.");
     }