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

Commit 77d4bdc6 authored by Atneya Nair's avatar Atneya Nair Committed by Android (Google) Code Review
Browse files

Merge "[audio] Remove unnecessary PackageManager call" into main

parents f5035fe0 424e87b5

services/audioflinger/PlaybackTracks.h

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ private: 
                       const AttributionSourceState& attributionSource,

                       audio_usage_t usage, int id, uid_t uid);

    void onFirstRef() override;

    static void getPackagesForUid(uid_t uid, Vector<String16>& packages);



    AppOpsManager mAppOpsManager;

services/audioflinger/Tracks.cpp

+3 −15
Original line number Diff line number Diff line
@@ -698,16 +698,12 @@ sp<OpPlayAudioMonitor> OpPlayAudioMonitor::createIfNeeded( 
            const AttributionSourceState& attributionSource, const audio_attributes_t& attr, int id,

            audio_stream_type_t streamType)

{

    Vector<String16> packages;

    const uid_t uid = VALUE_OR_FATAL(aidl2legacy_int32_t_uid_t(attributionSource.uid));

    getPackagesForUid(uid, packages);

    if (isServiceUid(uid)) {

        if (packages.isEmpty()) {

        ALOGW("OpPlayAudio: not muting track:%d usage:%d for service UID %d", id, attr.usage,

              uid);

        return nullptr;

    }

    }

    // stream type has been filtered by audio policy to indicate whether it can be muted

    if (streamType == AUDIO_STREAM_ENFORCED_AUDIBLE) {

        ALOGD("OpPlayAudio: not muting track:%d usage:%d ENFORCED_AUDIBLE", id, attr.usage);
@@ -799,14 +795,6 @@ void OpPlayAudioMonitor::PlayAudioOpCallback::opChanged(int32_t op, 
    }

}



// static

void OpPlayAudioMonitor::getPackagesForUid(

    uid_t uid, Vector<String16>& packages)

{

    PermissionController permissionController;

    permissionController.getPackagesForUid(uid, packages);

}



// ----------------------------------------------------------------------------

#undef LOG_TAG

#define LOG_TAG "AF::Track"