Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b5efbe authored by Nino Jagar's avatar Nino Jagar Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I9d61a61d15005c03f27a4dd99b4012978e4fc338
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3003485 6a827552

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java

+2 −4
Original line number Diff line number Diff line
@@ -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);