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

Commit 6ffa7b12 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Condition background record restriction on Sdk" into udc-dev am: 35a224e0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24394995



Change-Id: If62b1132a14683a3cf85b2263d11075195b07ad7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 274c9215 35a224e0

services/audiopolicy/service/AudioPolicyService.cpp

+25 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sys/time.h>

#include <dlfcn.h>



#include <android/content/pm/IPackageManagerNative.h>

#include <audio_utils/clock.h>

#include <binder/IServiceManager.h>

#include <utils/Log.h>
@@ -202,6 +203,26 @@ static void destroyAudioPolicyManager(AudioPolicyInterface *interface) 
{

    delete interface;

}



namespace {

int getTargetSdkForPackageName(std::string_view packageName) {

    const auto binder = defaultServiceManager()->checkService(String16{"package_native"});

    int targetSdk = -1;

    if (binder != nullptr) {

        const auto pm = interface_cast<content::pm::IPackageManagerNative>(binder);

        if (pm != nullptr) {

            const auto status = pm->getTargetSdkVersionForPackage(

                    String16{packageName.data(), packageName.size()}, &targetSdk);

            return status.isOk() ? targetSdk : -1;

        }

    }

    return targetSdk;

}



bool doesPackageTargetAtLeastU(std::string_view packageName) {

    return getTargetSdkForPackageName(packageName) >= __ANDROID_API_U__;

}

} // anonymous

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



AudioPolicyService::AudioPolicyService()
@@ -1913,10 +1934,14 @@ void AudioPolicyService::OpRecordAudioMonitor::onFirstRef() 
    checkOp();

    mOpCallback = new RecordAudioOpCallback(this);

    ALOGV("start watching op %d for %s", mAppOp, mAttributionSource.toString().c_str());

    int flags = doesPackageTargetAtLeastU(

            mAttributionSource.packageName.value_or("")) ?

            AppOpsManager::WATCH_FOREGROUND_CHANGES : 0;

    // TODO: We need to always watch AppOpsManager::OP_RECORD_AUDIO too

    // since it controls the mic permission for legacy apps.

    mAppOpsManager.startWatchingMode(mAppOp, VALUE_OR_FATAL(aidl2legacy_string_view_String16(

        mAttributionSource.packageName.value_or(""))),

        flags,

        mOpCallback);

}