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

Commit f2c1f513 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Fix allowing playback capture for packages with shared UID" am: 210af508 am: 2595b965 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dc4f503d251e3252f7e6da2312ca4f29a6c5cea
parents ddbdc9e2 2595b965

media/utils/ServiceUtilities.cpp

+9 −9
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ status_t checkIMemory(const sp<IMemory>& iMemory) 
    return NO_ERROR;

}



sp<content::pm::IPackageManagerNative> MediaPackageManager::retreivePackageManager() {

sp<content::pm::IPackageManagerNative> MediaPackageManager::retrievePackageManager() {

    const sp<IServiceManager> sm = defaultServiceManager();

    if (sm == nullptr) {

        ALOGW("%s: failed to retrieve defaultServiceManager", __func__);
@@ -283,27 +283,27 @@ sp<content::pm::IPackageManagerNative> MediaPackageManager::retreivePackageManag 
std::optional<bool> MediaPackageManager::doIsAllowed(uid_t uid) {

    if (mPackageManager == nullptr) {

        /** Can not fetch package manager at construction it may not yet be registered. */

        mPackageManager = retreivePackageManager();

        mPackageManager = retrievePackageManager();

        if (mPackageManager == nullptr) {

            ALOGW("%s: Playback capture is denied as package manager is not reachable", __func__);

            return std::nullopt;

        }

    }



    // Retrieve package names for the UID and transform to a std::vector<std::string>.

    Vector<String16> str16PackageNames;

    PermissionController{}.getPackagesForUid(uid, str16PackageNames);

    std::vector<std::string> packageNames;

    auto status = mPackageManager->getNamesForUids({(int32_t)uid}, &packageNames);

    if (!status.isOk()) {

        ALOGW("%s: Playback capture is denied for uid %u as the package names could not be "

              "retrieved from the package manager: %s", __func__, uid, status.toString8().c_str());

        return std::nullopt;

    for (const auto& str16PackageName : str16PackageNames) {

        packageNames.emplace_back(String8(str16PackageName).string());

    }

    if (packageNames.empty()) {

        ALOGW("%s: Playback capture for uid %u is denied as no package name could be retrieved "

              "from the package manager: %s", __func__, uid, status.toString8().c_str());

              "from the package manager.", __func__, uid);

        return std::nullopt;

    }

    std::vector<bool> isAllowed;

    status = mPackageManager->isAudioPlaybackCaptureAllowed(packageNames, &isAllowed);

    auto status = mPackageManager->isAudioPlaybackCaptureAllowed(packageNames, &isAllowed);

    if (!status.isOk()) {

        ALOGW("%s: Playback capture is denied for uid %u as the manifest property could not be "

              "retrieved from the package manager: %s", __func__, uid, status.toString8().c_str());

media/utils/include/mediautils/ServiceUtilities.h

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public: 
private:

    static constexpr const char* nativePackageManagerName = "package_native";

    std::optional<bool> doIsAllowed(uid_t uid);

    sp<content::pm::IPackageManagerNative> retreivePackageManager();

    sp<content::pm::IPackageManagerNative> retrievePackageManager();

    sp<content::pm::IPackageManagerNative> mPackageManager; // To check apps manifest

    uint_t mPackageManagerErrors = 0;

    struct Package {