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

Merge "Fix init watchdog timeout due to a held lock" into udc-qpr-dev

Browse Source
This commit is contained in:
Nino Jagar
2023-08-17 20:03:08 +00:00
committed by Android (Google) Code Review
parent b89d421074 f54272515f
commit 6a827552d0
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
View File

@@ -1225,15 +1225,13 @@ public class ContentCaptureManagerService extends
public ContentCaptureOptions getOptions(@UserIdInt int userId,
@NonNull String packageName) {
boolean isContentCaptureReceiverEnabled;
boolean isContentProtectionReceiverEnabled;
boolean isContentProtectionReceiverEnabled =
isContentProtectionReceiverEnabled(userId, packageName);
ArraySet<ComponentName> whitelistedComponents = null;
synchronized (mGlobalWhitelistStateLock) {
isContentCaptureReceiverEnabled =
isContentCaptureReceiverEnabled(userId, packageName);
isContentProtectionReceiverEnabled =
isContentProtectionReceiverEnabled(userId, packageName);
if (!isContentCaptureReceiverEnabled) {
// Full package is not allowlisted: check individual components next
whitelistedComponents = getWhitelistedComponents(userId, packageName);