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

Commit d967f0a0 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant get()"

parents 05bfe50e 7fc9a6fd

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ size_t AudioSystem::gInBuffSize = 0; 
const sp<IAudioFlinger>& AudioSystem::get_audio_flinger()

{

    Mutex::Autolock _l(gLock);

    if (gAudioFlinger.get() == 0) {

    if (gAudioFlinger == 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder;

        do {
@@ -499,7 +499,7 @@ sp<AudioSystem::AudioPolicyServiceClient> AudioSystem::gAudioPolicyServiceClient 
const sp<IAudioPolicyService>& AudioSystem::get_audio_policy_service()

{

    gLock.lock();

    if (gAudioPolicyService.get() == 0) {

    if (gAudioPolicyService == 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder;

        do {

media/libmedia/IMediaDeathNotifier.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ IMediaDeathNotifier::getMediaPlayerService() 
{

    ALOGV("getMediaPlayerService");

    Mutex::Autolock _l(sServiceLock);

    if (sMediaPlayerService.get() == 0) {

    if (sMediaPlayerService == 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder;

        do {

media/libmedia/mediametadataretriever.cpp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ sp<MediaMetadataRetriever::DeathNotifier> MediaMetadataRetriever::sDeathNotifier 
const sp<IMediaPlayerService>& MediaMetadataRetriever::getService()

{

    Mutex::Autolock lock(sServiceLock);

    if (sService.get() == 0) {

    if (sService == 0) {

        sp<IServiceManager> sm = defaultServiceManager();

        sp<IBinder> binder;

        do {

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ status_t AudioFlinger::setParameters(int ioHandle, const String8& keyValuePairs) 
        thread = checkPlaybackThread_l(ioHandle);

        if (thread == NULL) {

            thread = checkRecordThread_l(ioHandle);

        } else if (thread.get() == primaryPlaybackThread_l()) {

        } else if (thread == primaryPlaybackThread_l()) {

            // indicate output device change to all input threads for pre processing

            AudioParameter param = AudioParameter(keyValuePairs);

            int value;
@@ -5760,7 +5760,7 @@ sp<AudioFlinger::EffectHandle> AudioFlinger::ThreadBase::createEffect_l( 
            effect = chain->getEffectFromDesc_l(desc);

        }



        ALOGV("createEffect_l() got effect %p on chain %p", effect == 0 ? 0 : effect.get(), chain.get());

        ALOGV("createEffect_l() got effect %p on chain %p", effect.get(), chain.get());



        if (effect == 0) {

            int id = mAudioFlinger->nextUniqueId();