commit 61e3189ec7548b23e6ec54e49ab30a15ffda8fca
author Treehugger Robot <treehugger-gerrit@google.com> Wed Oct 25 02:34:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 25 02:34:18 2017 +0000
tree ee0411853fde7bd9b7189c6246110bb772e3fa4e
parent 0c41ad872f387b6cc3cee4732b43d37b1b3c334f
parent 3d5811d3ce10d86636b4e3045fc71f4d52025a3e

Merge changes I119cf83a,Icc5a1e38,If07a04d3

* changes:
  Binder: Update to new ScopedLocalRef
  Binder: Clean up JNI code
  Binder: Change reaction to Error

core/java/android/os/HwBinder.java

diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java
index 270e63f..c1c65ff 100644
--- a/core/java/android/os/HwBinder.java
+++ b/core/java/android/os/HwBinder.java
@@ -48,7 +48,8 @@
 
     public static native final IHwBinder getService(
             String iface,
-            String serviceName)
+            String serviceName,
+            boolean isTry)
         throws RemoteException, NoSuchElementException;
 
     public static native final void configureRpcThreadpool(

core/jni/android_os_HwBinder.cpp

diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp
index fe14d48..7fd97b2 100644
--- a/core/jni/android_os_HwBinder.cpp
+++ b/core/jni/android_os_HwBinder.cpp
@@ -303,7 +303,8 @@
         JNIEnv *env,
         jclass /* clazzObj */,
         jstring ifaceNameObj,
-        jstring serviceNameObj) {
+        jstring serviceNameObj,
+        jboolean isTry) {
 
     using ::android::hidl::base::V1_0::IBase;
     using ::android::hardware::details::getRawServiceInternal;
@@ -331,8 +332,7 @@
     std::string serviceName(serviceNameCStr);
     env->ReleaseStringUTFChars(serviceNameObj, serviceNameCStr);
 
-    // TODO(b/67981006): true /* retry */
-    sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, false /* retry */, false /* getStub */); 
+    sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, !isTry /* retry */, false /* getStub */);
     sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret);
 
     if (service == NULL) {
@@ -371,7 +371,7 @@
     { "registerService", "(Ljava/lang/String;)V",
         (void *)JHwBinder_native_registerService },
 
-    { "getService", "(Ljava/lang/String;Ljava/lang/String;)L" PACKAGE_PATH "/IHwBinder;",
+    { "getService", "(Ljava/lang/String;Ljava/lang/String;Z)L" PACKAGE_PATH "/IHwBinder;",
         (void *)JHwBinder_native_getService },
 
     { "configureRpcThreadpool", "(JZ)V",