Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c6f0240 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

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

am: c1616f68

Change-Id: I5d53c369ae9cb1bc963b06e734cf9c47ad61265f
parents 8476a2c7 c1616f68

core/java/android/os/HwBinder.java

+10 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package android.os;



import java.util.ArrayList;

import java.util.NoSuchElementException;

import libcore.util.NativeAllocationRegistry;



import java.util.NoSuchElementException;



/** @hide */

public abstract class HwBinder implements IHwBinder {

    private static final String TAG = "HwBinder";
@@ -46,9 +46,16 @@ public abstract class HwBinder implements IHwBinder { 
    public native final void registerService(String serviceName)

        throws RemoteException;



    public static native final IHwBinder getService(

    public static final IHwBinder getService(

            String iface,

            String serviceName)

        throws RemoteException, NoSuchElementException {

        return getService(iface, serviceName, false /* retry */);

    }

    public static native final IHwBinder getService(

            String iface,

            String serviceName,

            boolean retry)

        throws RemoteException, NoSuchElementException;



    public static native final void configureRpcThreadpool(

core/jni/android_os_HwBinder.cpp

+4 −4
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ static jobject JHwBinder_native_getService( 
        JNIEnv *env,

        jclass /* clazzObj */,

        jstring ifaceNameObj,

        jstring serviceNameObj) {

        jstring serviceNameObj,

        jboolean retry) {



    using ::android::hidl::base::V1_0::IBase;

    using ::android::hardware::details::getRawServiceInternal;
@@ -319,8 +320,7 @@ static jobject JHwBinder_native_getService( 
        serviceName = str.c_str();

    }



    // TODO(b/67981006): true /* retry */

    sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, false /* retry */, false /* getStub */);

    sp<IBase> ret = getRawServiceInternal(ifaceName, serviceName, retry /* retry */, false /* getStub */);

    sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret);



    if (service == NULL) {
@@ -360,7 +360,7 @@ static JNINativeMethod gMethods[] = { 
    { "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",