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

Commit 9e4eb522 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "Check tvinput AIDL existing before using"

parents c7231d8f f08dbaf6

services/core/jni/tvinput/JTvInputHal.cpp

+5 −2
Original line number Diff line number Diff line
@@ -42,8 +42,11 @@ JTvInputHal* JTvInputHal::createInstance(JNIEnv* env, jobject thiz, const sp<Loo 
                               std::shared_ptr<ITvInputWrapper>(new ITvInputWrapper(hidlITvInput)),

                               looper);

    }

    std::shared_ptr<AidlITvInput> aidlITvInput = nullptr;

    if (AServiceManager_isDeclared(TV_INPUT_AIDL_SERVICE_NAME)) {

        ::ndk::SpAIBinder binder(AServiceManager_waitForService(TV_INPUT_AIDL_SERVICE_NAME));

    std::shared_ptr<AidlITvInput> aidlITvInput = AidlITvInput::fromBinder(binder);

        aidlITvInput = AidlITvInput::fromBinder(binder);

    }

    if (aidlITvInput == nullptr) {

        ALOGE("Couldn't get tv.input service.");

        return nullptr;