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

Fix a CDM crash during association

Browse Source 
The issue happens when the package is power save whitelisted by the
system but doesn't have REQUEST_COMPANION_RUN_IN_BACKGROUND permission.

Fix: 205356884

Test: N/A
Change-Id: Idc4203030ecd70df470b080cb2a38219a88875c0
This commit is contained in:
Guojing Yuan
2021-11-09 21:56:05 +00:00
parent 90dda86f0c
commit ad969ad7bc
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java
View File

@@ -757,7 +757,12 @@ public class CompanionDeviceManagerService extends SystemService {
android.Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND)) {
mPowerWhitelistManager.addToWhitelist(packageInfo.packageName);
} else {
mPowerWhitelistManager.removeFromWhitelist(packageInfo.packageName);
try {
mPowerWhitelistManager.removeFromWhitelist(packageInfo.packageName);
} catch (UnsupportedOperationException e) {
Slog.w(LOG_TAG, packageInfo.packageName + " can't be removed from power save"
+ " whitelist. It might due to the package is whitelisted by the system.");
}
}
NetworkPolicyManager networkPolicyManager = NetworkPolicyManager.from(getContext());