commit f263d1becd8722e31f00b18be81bbb4c051d5578
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 25 00:13:15 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 25 00:13:15 2022 +0000
tree dd99e75692655b57b5b5ea122370b959d91e4365
parent 5d946def0628aade546bc575e657c32adc7f623a
parent 8916c8fe2be332c27b187c2933b84524cdc62df8

Merge "resource_manager: fix cross-type reclaim" am: 5307c587cb am: 972e33466d am: 8916c8fe2b

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

Change-Id: I1376995e5017e559680c48cc0a3eae663b6ae990
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/mediaresourcemanager/ResourceManagerService.cpp

diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 57be435..1c09544 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -696,11 +696,11 @@
         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);
             }
         }