commit 5307c587cb731178a1872fe6eb471a50f13e85a1
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 24 23:32:31 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 24 23:32:31 2022 +0000
tree d2ba2677d6d87f58980e4a9245bfa3f6d86f675b
parent 0e6a9b93b09b5b6b88dca32337a672f6a28c1c4c
parent b3639012e28bc7c89128ac12a646df0750cdfedb

Merge "resource_manager: fix cross-type reclaim"

services/mediaresourcemanager/ResourceManagerService.cpp

diff --git a/services/mediaresourcemanager/ResourceManagerService.cpp b/services/mediaresourcemanager/ResourceManagerService.cpp
index 953686b..0167cba 100644
--- a/services/mediaresourcemanager/ResourceManagerService.cpp
+++ b/services/mediaresourcemanager/ResourceManagerService.cpp
@@ -671,11 +671,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);
             }
         }