Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "HIDL Java getService now the same as C++.""

Browse Source 
am: 65d1e549b6

Change-Id: I545166bd11ee2a38b43743ebb4559429e1b22349
This commit is contained in:
Steven Moreland
2017-10-25 05:17:19 +00:00
committed by android-build-merger
parent 315bbfc213 65d1e549b6
commit 4868f5311e
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/HwBinder.java
View File

@@ -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(

8
core/jni/android_os_HwBinder.cpp
View File

@@ -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",