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

Commit e1410905 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Fix stack-pointer constructed sp<>. am: e951f2a6 am: 9aabfeca 

Change-Id: I1c85bb16bcdd47a6239a7ffb9fadee27b775f2cb
parents dcd93513 9aabfeca

broadcastradio/1.1/default/service.cpp

+3 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "BroadcastRadioFactory.h"



using android::sp;

using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::hardware::broadcastradio::V1_1::implementation::BroadcastRadioFactory;
@@ -27,8 +28,8 @@ using android::hardware::broadcastradio::V1_1::implementation::BroadcastRadioFac 
int main(int /* argc */, char** /* argv */) {

    configureRpcThreadpool(4, true);



    BroadcastRadioFactory broadcastRadioFactory;

    auto status = broadcastRadioFactory.registerAsService();

    sp<BroadcastRadioFactory> broadcastRadioFactory(new BroadcastRadioFactory());

    auto status = broadcastRadioFactory->registerAsService();

    CHECK_EQ(status, android::OK) << "Failed to register Broadcast Radio HAL implementation";



    joinRpcThreadpool();

broadcastradio/2.0/default/service.cpp

+5 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "BroadcastRadio.h"

#include "VirtualRadio.h"



using android::sp;

using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;

using android::hardware::broadcastradio::V2_0::implementation::BroadcastRadio;
@@ -30,13 +31,13 @@ int main() { 
    android::base::SetMinimumLogSeverity(android::base::VERBOSE);

    configureRpcThreadpool(4, true);



    BroadcastRadio broadcastRadio(gAmFmRadio);

    auto amFmStatus = broadcastRadio.registerAsService("amfm");

    sp<BroadcastRadio> broadcastRadio(new BroadcastRadio(gAmFmRadio));

    auto amFmStatus = broadcastRadio->registerAsService("amfm");

    CHECK_EQ(amFmStatus, android::OK)

        << "Failed to register Broadcast Radio AM/FM HAL implementation";



    BroadcastRadio dabRadio(gDabRadio);

    auto dabStatus = dabRadio.registerAsService("dab");

    sp<BroadcastRadio> dabRadio(new BroadcastRadio(gDabRadio));

    auto dabStatus = dabRadio->registerAsService("dab");

    CHECK_EQ(dabStatus, android::OK) << "Failed to register Broadcast Radio DAB HAL implementation";



    joinRpcThreadpool();