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 am: e2a47a2c3a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988949

Change-Id: I9a1e51d7da578a5fc684fb2f772286f6110c13bf
This commit is contained in:
TreeHugger Robot
2022-02-23 22:31:55 +00:00
committed by Automerger Merge Worker
parent 7a8cf63d49 e2a47a2c3a
commit 461cb38abc
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,13 +118,14 @@ class CompanionApplicationController {
serviceConnectors = CollectionUtils.map(companionServices, componentName ->
new CompanionDeviceServiceConnector(mContext, userId, componentName));
mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);
}
if (serviceConnectors.isEmpty()) {
Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: "
+ packageName + ". Please check if they are correctly declared.");
return;
if (serviceConnectors.isEmpty()) {
Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: "
+ packageName + ". Please check if they are correctly declared.");
return;
}
mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);
}
// The first connector in the list is always the primary connector: set a listener to it.