| commit | 76b5efbe21184fbc5144cb3c66b8ceb7ed2f482a | [log] [tgz] |
|---|---|---|
| author | Nino Jagar <njagar@google.com> | Thu Aug 17 20:04:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 17 20:04:54 2023 +0000 |
| tree | e49450458e3ae722f1046801ab1d5c01561da0c4 | |
| parent | f3003485c2d73adb300cf35040f489988fbb335f [diff] | |
| parent | 6a827552d02ced28003d68407de15e0e480ad72a [diff] |
Merge "Fix init watchdog timeout due to a held lock" into udc-qpr-dev am: 6a827552d0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24449940 Change-Id: I9d61a61d15005c03f27a4dd99b4012978e4fc338 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java index 315972c..f594170 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 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);