Car: Annotate trivial @GuardedBy

Add @GuardedBy for simple functions that require a single lock
and are named XYZLocked.

Derived by errorprone.

Bug: 73000847
Test: m
Test: m javac-check-framework RUN_ERROR_PRONE=true
Change-Id: Idd443648d5f66c90dff9b16cd4a8473e7af131ea

8 files changed, 15 insertions, 0 deletions

diff --git a/service/src/com/android/car/CarDiagnosticService.java b/service/src/com/android/car/CarDiagnosticService.java
index a0ab596573..e23f9a10c9 100644
--- a/service/src/com/android/car/CarDiagnosticService.java
+++ b/service/src/com/android/car/CarDiagnosticService.java
@@ -469,6 +469,7 @@ public class CarDiagnosticService extends ICarDiagnostic.Stub
      * @param listener
      * @return null if not found.
      */
+    @GuardedBy("mDiagnosticLock")
     private CarDiagnosticService.DiagnosticClient findDiagnosticClientLocked(
             ICarDiagnosticEventListener listener) {
         IBinder binder = listener.asBinder();
diff --git a/service/src/com/android/car/CarPowerManagementService.java b/service/src/com/android/car/CarPowerManagementService.java
index 855c45c949..16ece5181a 100644
--- a/service/src/com/android/car/CarPowerManagementService.java
+++ b/service/src/com/android/car/CarPowerManagementService.java
@@ -359,6 +359,7 @@ public class CarPowerManagementService implements CarServiceBase,
         }
     }
 
+    @GuardedBy("this")
     private void releaseTimerLocked() {
         if (mTimer != null) {
             mTimer.cancel();
diff --git a/service/src/com/android/car/CarSensorService.java b/service/src/com/android/car/CarSensorService.java
index 50f39e0e33..d90a43a70a 100644
--- a/service/src/com/android/car/CarSensorService.java
+++ b/service/src/com/android/car/CarSensorService.java
@@ -199,6 +199,7 @@ public class CarSensorService extends ICarSensor.Stub
         return event;
     }
 
+    @GuardedBy("mSensorLock")
     private void addNewSensorRecordLocked(int type, CarSensorEvent event) {
         SensorRecord record = new SensorRecord();
         record.lastEvent = event;
@@ -625,6 +626,7 @@ public class CarSensorService extends ICarSensor.Stub
         return null;
     }
 
+    @GuardedBy("mSensorLock")
     private int[] refreshSupportedSensorsLocked() {
         int numCarSensors = (mCarProvidedSensors == null) ? 0 : mCarProvidedSensors.length;
         for (int i = 0; i < numCarSensors; i++) {
@@ -688,6 +690,7 @@ public class CarSensorService extends ICarSensor.Stub
      * @param listener
      * @return null if not found.
      */
+    @GuardedBy("mSensorLock")
     private SensorClient findSensorClientLocked(ICarSensorEventListener listener) {
         IBinder binder = listener.asBinder();
         for (SensorClient sensorClient : mClients) {
diff --git a/service/src/com/android/car/GarageModeService.java b/service/src/com/android/car/GarageModeService.java
index 02d31ad1e6..269f2868d0 100644
--- a/service/src/com/android/car/GarageModeService.java
+++ b/service/src/com/android/car/GarageModeService.java
@@ -228,6 +228,7 @@ public class GarageModeService implements CarServiceBase,
         }
     }
 
+    @GuardedBy("this")
     private void readPolicyLocked() {
         logd("readPolicy");
         // TODO: define a xml schema for policy and read it from system dir. bug: 32096969
@@ -357,6 +358,7 @@ public class GarageModeService implements CarServiceBase,
         }
     }
 
+    @GuardedBy("this")
     private void readFromSettingsLocked(String... keys) {
         for (String key : keys) {
             switch (key) {
diff --git a/service/src/com/android/car/VmsLayersAvailability.java b/service/src/com/android/car/VmsLayersAvailability.java
index 4d3be375bc..200b347a32 100644
--- a/service/src/com/android/car/VmsLayersAvailability.java
+++ b/service/src/com/android/car/VmsLayersAvailability.java
@@ -144,6 +144,7 @@ public class VmsLayersAvailability {
         }
     }
 
+    @GuardedBy("mLock")
     private void addLayerToAvailabilityCalculationLocked(VmsLayer layer,
                                                          Set<VmsLayer> currentAvailableLayers,
                                                          Set<VmsLayer> cyclicAvoidanceSet) {
diff --git a/service/src/com/android/car/VmsPublishersInfo.java b/service/src/com/android/car/VmsPublishersInfo.java
index 0f73e5cb74..e8baf58394 100644
--- a/service/src/com/android/car/VmsPublishersInfo.java
+++ b/service/src/com/android/car/VmsPublishersInfo.java
@@ -82,6 +82,7 @@ public class VmsPublishersInfo {
         }
     }
 
+    @GuardedBy("mLock")
     private void maybeAddPublisherInfoLocked(InfoWrapper wrappedPublisherInfo) {
         if (!mPublishersIds.containsKey(wrappedPublisherInfo)) {
             // Assign ID to the info
diff --git a/service/src/com/android/car/cluster/InstrumentClusterService.java b/service/src/com/android/car/cluster/InstrumentClusterService.java
index eef177c420..cb4f041232 100644
--- a/service/src/com/android/car/cluster/InstrumentClusterService.java
+++ b/service/src/com/android/car/cluster/InstrumentClusterService.java
@@ -458,6 +458,7 @@ public class InstrumentClusterService implements CarServiceBase,
         }
     }
 
+    @GuardedBy("mSync")
     private ClusterActivityInfo getOrCreateActivityInfoLocked(String category) {
         return mActivityInfoByCategory.computeIfAbsent(category, k -> new ClusterActivityInfo());
     }
diff --git a/service/src/com/android/car/pm/CarPackageManagerService.java b/service/src/com/android/car/pm/CarPackageManagerService.java
index 46c3096f83..ff96ac41f8 100644
--- a/service/src/com/android/car/pm/CarPackageManagerService.java
+++ b/service/src/com/android/car/pm/CarPackageManagerService.java
@@ -221,6 +221,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
         }
     }
 
+    @GuardedBy("this")
     private AppBlockingPackageInfo searchFromBlacklistsLocked(String packageName) {
         for (ClientPolicy policy : mClientPolicies.values()) {
             AppBlockingPackageInfoWrapper wrapper = policy.blacklistsMap.get(packageName);
@@ -231,6 +232,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
         return null;
     }
 
+    @GuardedBy("this")
     private AppBlockingPackageInfo searchFromWhitelistsLocked(String packageName) {
         for (ClientPolicy policy : mClientPolicies.values()) {
             AppBlockingPackageInfoWrapper wrapper = policy.whitelistsMap.get(packageName);
@@ -242,6 +244,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
         return (wrapper != null) ? wrapper.info : null;
     }
 
+    @GuardedBy("this")
     private boolean isActivityInWhitelistsLocked(String packageName, String className) {
         for (ClientPolicy policy : mClientPolicies.values()) {
             if (isActivityInMapAndMatching(policy.whitelistsMap, packageName, className)) {
@@ -311,6 +314,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
         notifyAll();
     }
 
+    @GuardedBy("this")
     private void wakeupClientsWaitingForPolicySetitngLocked() {
         for (CarAppBlockingPolicy waitingPolicy : mWaitingPolicies) {
             synchronized (waitingPolicy) {
@@ -599,6 +603,7 @@ public class CarPackageManagerService extends ICarPackageManager.Stub implements
         }
     }
 
+    @GuardedBy("this")
     private String dumpPoliciesLocked(boolean dumpAll) {
         StringBuilder sb = new StringBuilder();
         if (dumpAll) {