commit f54272515f2f7394d1f78558bc2193f238df1582
author Nino Jagar <njagar@google.com> Wed Aug 16 21:17:14 2023 +0000
committer Nino Jagar <njagar@google.com> Wed Aug 16 21:22:21 2023 +0000
tree 2d71cd88bbf7bd59403e5185b40e8cf481fe501b
parent 5ebc66b0e4a51702bf3a0d8e635902d00f70431a

Fix init watchdog timeout due to a held lock

Bug: 296285231
Test: Manual
Change-Id: I38ddef4ce2bcf0a4b5c1534184e01cf914f5da2c

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

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);