| commit | 3e85a02e9fb80d995cd4ddc9871437f8efcd4585 | [log] [tgz] |
|---|---|---|
| author | Nino Jagar <njagar@google.com> | Thu Aug 17 20:10:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 17 20:10:39 2023 +0000 |
| tree | 3b988dbbaa182da0a6f62dc0aedb819bf3ddb60f | |
| parent | aa0f825c9cc38dffaa8c8e2f86319193f304e306 [diff] | |
| parent | 76b5efbe21184fbc5144cb3c66b8ceb7ed2f482a [diff] |
Merge "Fix init watchdog timeout due to a held lock" into udc-qpr-dev am: 6a827552d0 am: 76b5efbe21 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24449940 Change-Id: I5d58e1048fb707dec7e874272ad804b35a2f189e 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);