diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index 315972cde76b0..f59417046c85a 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java @@ -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 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);