commit 3ddeb74685e1f7e1be89e75d39b24b4be8936ec5
author Xin Li <delphij@google.com> Tue Mar 12 22:55:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Mar 12 22:55:29 2019 -0700
tree 487b3899e1cfb012cf476417ac0d0ca11ff6bf46
parent b624c02749e002e95812b88ba01d5c93840a5246
parent dd589d07e0439abd7c0f304ce457fa90df0078f8

[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: bf44d5a44c -s ours am: 3548d8d5ec -s ours
am: dd589d07e0 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0968c9ae8ced710ee25946855b6be88e6eecb2d

service.cpp

diff --git a/service.cpp b/service.cpp
index c7c2a95..9dd1aee 100644
--- a/service.cpp
+++ b/service.cpp
@@ -50,6 +50,8 @@
 // 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;
 
@@ -137,15 +139,19 @@
 };
 
 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)) {
+    if (!manager->add(serviceName, manager).withDefault(false)) {
         ALOGE("Failed to register hwservicemanager with itself.");
     }
 
     sp<TokenManager> tokenManager = new TokenManager();
-    if (!manager->add(serviceName, tokenManager)) {
+    if (!manager->add(serviceName, tokenManager).withDefault(false)) {
         ALOGE("Failed to register ITokenManager with hwservicemanager.");
     }