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

Commit 4a5a723f authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "AudioFlinger: update to use uid_t"

parents 2c131c37 d01b0f18

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -929,12 +929,12 @@ void AudioFlinger::ThreadBase::getPowerManager_l() { 
    }

}



void AudioFlinger::ThreadBase::updateWakeLockUids_l(const SortedVector<int> &uids) {

void AudioFlinger::ThreadBase::updateWakeLockUids_l(const SortedVector<uid_t> &uids) {

    getPowerManager_l();



#if !LOG_NDEBUG

    std::stringstream s;

    for (int uid : uids) {

    for (uid_t uid : uids) {

        s << uid << " ";

    }

    ALOGD("updateWakeLockUids_l %s uids:%s", mThreadName, s.str().c_str());

services/audioflinger/Threads.h

+3 −3
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ protected: 
                virtual void acquireWakeLock_l();

                void        releaseWakeLock();

                void        releaseWakeLock_l();

                void        updateWakeLockUids_l(const SortedVector<int> &uids);

                void        updateWakeLockUids_l(const SortedVector<uid_t> &uids);

                void        getPowerManager_l();

                void setEffectSuspended_l(const effect_uuid_t *type,

                                          bool suspend,
@@ -552,8 +552,8 @@ protected: 
                    void            updatePowerState(sp<ThreadBase> thread, bool force = false);



                private:

                    SortedVector<int> getWakeLockUids() {

                        SortedVector<int> wakeLockUids;

                    SortedVector<uid_t> getWakeLockUids() {

                        SortedVector<uid_t> wakeLockUids;

                        for (const sp<T> &track : mActiveTracks) {

                            wakeLockUids.add(track->uid());

                        }