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

Commit e478742c authored by Glenn Kasten's avatar Glenn Kasten
Browse files

No need to check a wp<> for 0 before promote() 

Also remove unnecessary wp<> local variable.

Change-Id: I620e67b5d559d28616f8e00609a525cfe19c5ddc
parent cf0c7d10

services/audioflinger/AudioFlinger.cpp

+8 −14
Original line number Diff line number Diff line
@@ -265,15 +265,12 @@ status_t AudioFlinger::dumpClients(int fd, const Vector<String16>& args) 


    result.append("Clients:\n");

    for (size_t i = 0; i < mClients.size(); ++i) {

        wp<Client> wClient = mClients.valueAt(i);

        if (wClient != 0) {

            sp<Client> client = wClient.promote();

        sp<Client> client = mClients.valueAt(i).promote();

        if (client != 0) {

            snprintf(buffer, SIZE, "  pid: %d\n", client->pid());

            result.append(buffer);

        }

    }

    }



    result.append("Global session refs:\n");

    result.append(" session pid cnt\n");
@@ -1431,15 +1428,12 @@ status_t AudioFlinger::PlaybackThread::dumpTracks(int fd, const Vector<String16> 
    result.append(buffer);

    result.append("   Name  Clien Typ Fmt Chn mask   Session Buf  S M F SRate LeftV RighV  Serv       User       Main buf   Aux Buf\n");

    for (size_t i = 0; i < mActiveTracks.size(); ++i) {

        wp<Track> wTrack = mActiveTracks[i];

        if (wTrack != 0) {

            sp<Track> track = wTrack.promote();

        sp<Track> track = mActiveTracks[i].promote();

        if (track != 0) {

            track->dump(buffer, SIZE);

            result.append(buffer);

        }

    }

    }

    write(fd, result.string(), result.size());

    return NO_ERROR;

}