Merge "Callback elision for HIDL interfaces." am: 33bd8a97b3

am: 4369507dcb

Change-Id: Ic9ea53f3b7cff0d656b6147ca6d159b75df0bdda

1 files changed, 3 insertions, 9 deletions

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index c456d622ab5a..81199fa41e1b 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -325,15 +325,9 @@ static jobject JHwBinder_native_getService(
         return NULL;
     }
 
-    sp<hardware::IBinder> service;
-    manager->get(
-            ifaceName,
-            serviceName,
-            [&service](sp<hidl::base::V1_0::IBase> out) {
-                service = hardware::toBinder<
-                        hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase
-                    >(out);
-            });
+    sp<hidl::base::V1_0::IBase> base = manager->get(ifaceName, serviceName);
+    sp<hardware::IBinder> service = hardware::toBinder<
+            hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase>(base);
 
     env->ReleaseStringUTFChars(ifaceNameObj, ifaceName);
     ifaceName = NULL;