commit 0852dae273c4043bbac39b25ad6a1fb1807659bc
author Tri Vo <trong@google.com> Fri Feb 08 15:41:51 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 08 15:41:51 2019 -0800
tree a6de32c09aa4203a5f196fc8f536c9bdb712ecf1
parent 7659528a29d9315730436b9a287428c15cad5ca9
parent 5b8024f3a484203650c3065e68391a6b26a265ab

ashmemd: avoid sleep cycle on non-VNDK devices. am: 8411a3b016 am: 0d7dfbd354
am: 5b8024f3a4

Change-Id: I9cc910aad5e7d166622faf0216d84e5574f2ade2

ashmemd_client.cpp

diff --git a/ashmemd_client.cpp b/ashmemd_client.cpp
index 1984358..3380209 100644
--- a/ashmemd_client.cpp
+++ b/ashmemd_client.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <android-base/logging.h>
 #include <android/ashmemd/IAshmemDeviceService.h>
 #include <binder/IServiceManager.h>
 
@@ -28,17 +29,23 @@
 
 sp<IAshmemDeviceService> getAshmemService() {
     sp<IServiceManager> sm = android::defaultServiceManager();
-    sp<IBinder> binder = sm->getService(String16("ashmem_device_service"));
+    sp<IBinder> binder = sm->checkService(String16("ashmem_device_service"));
     return interface_cast<IAshmemDeviceService>(binder);
 }
 
 extern "C" int openAshmemdFd() {
     static sp<IAshmemDeviceService> ashmemService = getAshmemService();
-    if (!ashmemService) return -1;
+    if (!ashmemService) {
+        LOG(ERROR) << "Failed to get IAshmemDeviceService.";
+        return -1;
+    }
 
     ParcelFileDescriptor fd;
     auto status = ashmemService->open(&fd);
-    if (!status.isOk()) return -1;
+    if (!status.isOk()) {
+        LOG(ERROR) << "Failed IAshmemDeviceService::open()";
+        return -1;
+    }
 
     // unique_fd is the underlying type of ParcelFileDescriptor, i.e. fd is
     // closed when it falls out of scope, so we make a dup.