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

Commit abc39979 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "BroadcastRadio HAL uses "default" service name"

parents 8c4bbd5d f6090107

audio/2.0/default/service.cpp

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ int main(int /* argc */, char* /* argv */ []) { 
    // Soundtrigger and FM radio might be not present.

    status = registerPassthroughServiceImplementation<ISoundTriggerHw>("sound_trigger.primary");

    ALOGE_IF(status != OK, "Error while registering soundtrigger service: %d", status);

    status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>("broadcastradio");

    status = registerPassthroughServiceImplementation<IBroadcastRadioFactory>();

    ALOGE_IF(status != OK, "Error while registering fm radio service: %d", status);

    joinRpcThreadpool();

    return status;

broadcastradio/1.0/vts/functional/VtsHalBroadcastradioV1_0TargetTest.cpp

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class BroadcastRadioHidlTest : public ::testing::Test { 
            }

        }

        sp<IBroadcastRadioFactory> factory =

              IBroadcastRadioFactory::getService("broadcastradio", getStub);

              IBroadcastRadioFactory::getService(getStub);

        if (factory != 0) {

            factory->connectModule(Class::AM_FM,

                             [&](Result retval, const ::android::sp<IBroadcastRadio>& result) {