Merge "Update method annotation to ensure lock is held" into main

1 files changed, 2 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java
index 4694e9fd44bc..2067ad470743 100644
--- a/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java
+++ b/services/core/java/com/android/server/SensitiveContentProtectionManagerService.java
@@ -306,6 +306,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic
         }
     }
 
+    @GuardedBy("mSensitiveContentProtectionLock")
     private void updateAppsThatShouldBlockScreenCapture() {
         RankingMap rankingMap;
         try {
@@ -318,6 +319,7 @@ public final class SensitiveContentProtectionManagerService extends SystemServic
         updateAppsThatShouldBlockScreenCapture(rankingMap);
     }
 
+    @GuardedBy("mSensitiveContentProtectionLock")
     private void updateAppsThatShouldBlockScreenCapture(RankingMap rankingMap) {
         StatusBarNotification[] notifications;
         try {