Merge "Callback elision for HIDL interfaces."

am: 33bd8a97b3 Change-Id: Ic001e0d9a9c946cf9be38a55b2e0ec61b4931cf4
2017-01-05 09:47:45 +00:00
parent c8111e07d0 33bd8a97b3
commit 4369507dcb
1 changed files with 3 additions and 9 deletions
--- 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;