commit aa6ace9676924542feff93769e6e469ded64f0d8
author Steven Moreland <smoreland@google.com> Mon Mar 27 08:38:45 2017 -0700
committer Steven Moreland <smoreland@google.com> Mon Mar 27 08:38:45 2017 -0700
tree df7b78d7e660f94f3b1d5f31c7338fd493c9c0f4
parent 66ae7188f012ae659e2187216c418e8031458095

Exit if /dev/hwbinder not available.

Test: pass
Bug: 36577127
Change-Id: Ibd971215b08a1c124b793e083032c34749ca62dd

service.cpp

diff --git a/service.cpp b/service.cpp
index 755e463..63d756c 100644
--- a/service.cpp
+++ b/service.cpp
@@ -77,15 +77,7 @@
 
     IPCThreadState::self()->setupPolling(&binder_fd);
     if (binder_fd < 0) {
-        ALOGE("Failed to aquire binder FD; staying around but doing nothing");
-        // hwservicemanager is a critical service; until support for /dev/hwbinder
-        // is checked in for all devices, prevent it from exiting; if it were to
-        // exit, it would get restarted again and fail again several times,
-        // eventually causing the device to boot into recovery mode.
-        // TODO: revert
-        while (true) {
-          sleep(UINT_MAX);
-        }
+        ALOGE("Failed to aquire binder FD.");
         return -1;
     }