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

Commit c0631d0b authored by Steven Moreland's avatar Steven Moreland
Browse files

HwBinder: get/register checked exceptions. 

Bug: 33673120
Test: hidl_test_java
Change-Id: Id19b61b252e756a032ae11f7b59bd8eed82edbe9
parent 33bd8a97

core/java/android/os/HwBinder.java

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.os;



import java.util.ArrayList;

import java.util.NoSuchElementException;

import libcore.util.NativeAllocationRegistry;



/** @hide */
@@ -44,11 +45,13 @@ public abstract class HwBinder implements IHwBinder { 


    public native final void registerService(

            ArrayList<String> interfaceChain,

            String serviceName);

            String serviceName)

        throws RemoteException;



    public static native final IHwBinder getService(

            String iface,

            String serviceName);

            String serviceName)

        throws RemoteException, NoSuchElementException;



    // Returns address of the "freeFunction".

    private static native final long native_init();

core/java/android/os/IHwBinder.java

+0 −1
Original line number Diff line number Diff line
@@ -37,6 +37,5 @@ public interface IHwBinder { 
    }



    public boolean linkToDeath(DeathRecipient recipient, long cookie);



    public boolean unlinkToDeath(DeathRecipient recipient);

}

core/jni/android_os_HwBinder.cpp

+15 −11
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
using android::AndroidRuntime;

using android::hardware::hidl_vec;

using android::hardware::hidl_string;

template<typename T>

using Return = android::hardware::Return<T>;



#define PACKAGE_PATH    "android/os"

#define CLASS_NAME      "HwBinder"
@@ -257,8 +259,6 @@ static void JHwBinder_native_registerService( 
    hidl_vec<hidl_string> interfaceChain;

    interfaceChain.setToExternal(strings, numInterfaces, true /* shouldOwn */);



    using android::hidl::manager::V1_0::IServiceManager;



    sp<hardware::IBinder> binder = JHwBinder::GetNativeContext(env, thiz);



    /* TODO(b/33440494) this is not right */
@@ -268,24 +268,23 @@ static void JHwBinder_native_registerService( 


    if (manager == nullptr) {

        LOG(ERROR) << "Could not get hwservicemanager.";

        signalExceptionForError(env, UNKNOWN_ERROR);

        signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);

        return;

    }



    bool ok = manager->add(

                interfaceChain,

                serviceName,

                base);

    Return<bool> ret = manager->add(interfaceChain, serviceName, base);



    env->ReleaseStringUTFChars(serviceNameObj, serviceName);

    serviceName = NULL;



    bool ok = ret.isOk() && ret;



    if (ok) {

        LOG(INFO) << "Starting thread pool.";

        ::android::hardware::ProcessState::self()->startThreadPool();

    }



    signalExceptionForError(env, (ok ? OK : UNKNOWN_ERROR));

    signalExceptionForError(env, (ok ? OK : UNKNOWN_ERROR), true /* canThrowRemoteException */);

}



static jobject JHwBinder_native_getService(
@@ -321,13 +320,18 @@ static jobject JHwBinder_native_getService( 


    if (manager == nullptr) {

        LOG(ERROR) << "Could not get hwservicemanager.";

        signalExceptionForError(env, UNKNOWN_ERROR);

        signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);

        return NULL;

    }



    sp<hidl::base::V1_0::IBase> base = manager->get(ifaceName, serviceName);

    Return<sp<hidl::base::V1_0::IBase>> ret = manager->get(ifaceName, serviceName);



    if (!ret.isOk()) {

        signalExceptionForError(env, UNKNOWN_ERROR, true /* canThrowRemoteException */);

    }



    sp<hardware::IBinder> service = hardware::toBinder<

            hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase>(base);

            hidl::base::V1_0::IBase, hidl::base::V1_0::BpBase>(ret);



    env->ReleaseStringUTFChars(ifaceNameObj, ifaceName);

    ifaceName = NULL;