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

Commit fee17700 authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

Merge "Check for nullptr when casting IBinder to IBase." am: 50140286 

am: 1abe6def

Change-Id: I532e548c9558dada977ca1926ef4b7e39215924f
parents ca8412c3 1abe6def

core/jni/android_os_HwBinder.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -241,7 +241,14 @@ static void JHwBinder_native_registerService( 
    using android::hidl::manager::V1_0::IServiceManager;

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





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

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



    sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(binder);

    sp<hidl::base::V1_0::IBase> base = hidl::base::V1_0::IHwBase::asInterface(binder);

    if (base.get() == nullptr) {

        LOG(ERROR) << "IBinder object cannot be casted to the base interface.";

        signalExceptionForError(env, UNKNOWN_ERROR);

        return;

    }



    bool ok = hardware::defaultServiceManager()->add(

    bool ok = hardware::defaultServiceManager()->add(

                interfaceChain,

                interfaceChain,

                serviceName,

                serviceName,