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

Commit 1b3f417c authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Radio: get service by value. am: 28a0e9ec am: 7488cb12 am: 2d090ca6 am:... 

Radio: get service by value. am: 28a0e9ec am: 7488cb12 am: 2d090ca6 am: 294a831a am: 65b52ac3
am: f1da8747

Change-Id: I8f5925918e0f521a655773a247ad0346954197bc
parents d21bcd27 f1da8747

include/radio/Radio.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
private:

            Radio(radio_handle_t handle,

                            const sp<RadioCallback>&);

            static const sp<IRadioService>& getRadioService();

            static const sp<IRadioService> getRadioService();



            Mutex                   mLock;

            sp<IRadio>              mIRadio;

radio/Radio.cpp

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ namespace { 
    sp<DeathNotifier>         gDeathNotifier;

}; // namespace anonymous



const sp<IRadioService>& Radio::getRadioService()

const sp<IRadioService> Radio::getRadioService()

{

    Mutex::Autolock _l(gLock);

    if (gRadioService.get() == 0) {
@@ -84,7 +84,7 @@ status_t Radio::listModules(struct radio_properties *properties, 
                            uint32_t *numModules)

{

    ALOGV("listModules()");

    const sp<IRadioService>& service = getRadioService();

    const sp<IRadioService> service = getRadioService();

    if (service == 0) {

        return NO_INIT;

    }
@@ -98,7 +98,7 @@ sp<Radio> Radio::attach(radio_handle_t handle, 
{

    ALOGV("attach()");

    sp<Radio> radio;

    const sp<IRadioService>& service = getRadioService();

    const sp<IRadioService> service = getRadioService();

    if (service == 0) {

        return radio;

    }