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

Merge "Fix a CDM crash during association"

Browse Source
This commit is contained in:
Guojing Yuan
2021-11-10 17:52:57 +00:00
committed by Android (Google) Code Review
parent d364e6ad9c ad969ad7bc
commit eb6debfca6
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());