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

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

Merge "resource_manager: fix cross-type reclaim" am: 5307c587 am: 972e3346... 

Merge "resource_manager: fix cross-type reclaim" am: 5307c587 am: 972e3346 am: 8916c8fe am: f263d1be

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



Change-Id: Ib8b91a68d9b1da9b02741bdb6cc04b32d91223c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6339d14b f263d1be

services/mediaresourcemanager/ResourceManagerService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -696,11 +696,11 @@ Status ResourceManagerService::reclaimResource(int32_t callingPid, 
        if (clients.size() == 0) {

            // if we are here, run the fourth pass to free one codec with the different type.

            if (secureCodec != NULL) {

                MediaResource temp(MediaResource::Type::kNonSecureCodec, 1);

                MediaResource temp(MediaResource::Type::kNonSecureCodec, secureCodec->subType, 1);

                getClientForResource_l(callingPid, &temp, &clients);

            }

            if (nonSecureCodec != NULL) {

                MediaResource temp(MediaResource::Type::kSecureCodec, 1);

                MediaResource temp(MediaResource::Type::kSecureCodec, nonSecureCodec->subType, 1);

                getClientForResource_l(callingPid, &temp, &clients);

            }

        }