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

Merge "[CDM bug] Fix CDM crash when there's no CDM service" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-02-23 20:34:17 +00:00
committed by Android (Google) Code Review
parent f084f35b7a c1c451fc3b
commit e2a47a2c3a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/companion/java/com/android/server/companion/CompanionApplicationController.java
View File

@@ -118,8 +118,6 @@ class CompanionApplicationController {
serviceConnectors = CollectionUtils.map(companionServices, componentName -> serviceConnectors = CollectionUtils.map(companionServices, componentName ->
new CompanionDeviceServiceConnector(mContext, userId, componentName)); new CompanionDeviceServiceConnector(mContext, userId, componentName));
mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);
}
if (serviceConnectors.isEmpty()) { if (serviceConnectors.isEmpty()) {
Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: " Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: "
@@ -127,6 +125,9 @@ class CompanionApplicationController {
return; return;
} }
mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);
}
// The first connector in the list is always the primary connector: set a listener to it. // The first connector in the list is always the primary connector: set a listener to it.
serviceConnectors.get(0).setListener(this::onPrimaryServiceBindingDied); serviceConnectors.get(0).setListener(this::onPrimaryServiceBindingDied);