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

Commit 50140286 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Check for nullptr when casting IBinder to IBase."

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

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

    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(
                interfaceChain,
                serviceName,