diff options
| -rw-r--r-- | core/java/android/os/HwBinder.java | 3 | ||||
| -rw-r--r-- | core/jni/android_os_HwBinder.cpp | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/os/HwBinder.java b/core/java/android/os/HwBinder.java index c1c65ffcc049..270e63f408a7 100644 --- a/core/java/android/os/HwBinder.java +++ b/core/java/android/os/HwBinder.java @@ -48,8 +48,7 @@ public abstract class HwBinder implements IHwBinder { public static native final IHwBinder getService( String iface, - String serviceName, - boolean isTry) + String serviceName) throws RemoteException, NoSuchElementException; public static native final void configureRpcThreadpool( diff --git a/core/jni/android_os_HwBinder.cpp b/core/jni/android_os_HwBinder.cpp index 7fd97b232f07..fe14d483743f 100644 --- a/core/jni/android_os_HwBinder.cpp +++ b/core/jni/android_os_HwBinder.cpp @@ -303,8 +303,7 @@ static jobject JHwBinder_native_getService( JNIEnv *env, jclass /* clazzObj */, jstring ifaceNameObj, - jstring serviceNameObj, - jboolean isTry) { + jstring serviceNameObj) { using ::android::hidl::base::V1_0::IBase; using ::android::hardware::details::getRawServiceInternal; @@ -332,7 +331,8 @@ static jobject JHwBinder_native_getService( std::string serviceName(serviceNameCStr); env->ReleaseStringUTFChars(serviceNameObj, serviceNameCStr); - sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, !isTry /* retry */, false /* getStub */); + // TODO(b/67981006): true /* retry */ + sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, false /* retry */, false /* getStub */); sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret); if (service == NULL) { @@ -371,7 +371,7 @@ static JNINativeMethod gMethods[] = { { "registerService", "(Ljava/lang/String;)V", (void *)JHwBinder_native_registerService }, - { "getService", "(Ljava/lang/String;Ljava/lang/String;Z)L" PACKAGE_PATH "/IHwBinder;", + { "getService", "(Ljava/lang/String;Ljava/lang/String;)L" PACKAGE_PATH "/IHwBinder;", (void *)JHwBinder_native_getService }, { "configureRpcThreadpool", "(JZ)V", |