Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consider sharee's priority in resource granting/reclaiming

Browse Source 
Also, add null check to avoid NPE upon resource reclaiming

Bug: 203099909
Test: android.media.tv.tuner.cts.TunerTest
Change-Id: I2c92f7d81b5a739d153637b83c664bbfbe633715
This commit is contained in:
Kensuke Miyagi
2021-10-14 10:49:06 -07:00
parent 5b76efc971
commit f88074f371
1 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java
View File

@@ -893,7 +893,7 @@ public class TunerResourceManagerService extends SystemService implements IBinde
} else if (grantingFrontendHandle == TunerResourceManager.INVALID_RESOURCE_HANDLE) {
// Record the frontend id with the lowest client priority among all the
// in use frontends when no available frontend has been found.
int priority = updateAndGetOwnerClientPriority(fr.getOwnerClientId());
int priority = getFrontendHighestClientPriority(fr.getOwnerClientId());
if (currentLowestPriority > priority) {
inUseLowestPriorityFrHandle = fr.getHandle();
currentLowestPriority = priority;
@@ -1369,6 +1369,33 @@ public class TunerResourceManagerService extends SystemService implements IBinde
return profile.getPriority();
}
/**
* Update the owner and sharee clients' priority and get the highest priority
* for frontend resource
*
* @param clientId the owner client id.
* @return the highest priority among all the clients holding the same frontend resource.
*/
private int getFrontendHighestClientPriority(int clientId) {
// Check if the owner profile exists
ClientProfile ownerClient = getClientProfile(clientId);
if (ownerClient == null) {
return 0;
}
// Update and get the priority of the owner client
int highestPriority = updateAndGetOwnerClientPriority(clientId);
// Update and get all the client IDs of frontend resource holders
for (int shareeId : ownerClient.getShareFeClientIds()) {
int priority = updateAndGetOwnerClientPriority(shareeId);
if (priority > highestPriority) {
highestPriority = priority;
}
}
return highestPriority;
}
@VisibleForTesting
@Nullable
protected FrontendResource getFrontendResource(int frontendHandle) {
@@ -1546,6 +1573,9 @@ public class TunerResourceManagerService extends SystemService implements IBinde
}
private void clearAllResourcesAndClientMapping(ClientProfile profile) {
if (profile == null) {
return;
}
// Clear Lnb
for (Integer lnbHandle : profile.getInUseLnbHandles()) {
getLnbResource(lnbHandle).removeOwner();