diff options
10 files changed, 15 insertions, 0 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java index a70b88e87ae4..c36bb6d2e096 100644 --- a/services/accessibility/java/com/android/server/accessibility/MagnificationController.java +++ b/services/accessibility/java/com/android/server/accessibility/MagnificationController.java @@ -901,6 +901,7 @@ class MagnificationController implements Handler.Callback { } } + @GuardedBy("mLock") private void setMagnificationSpecLocked(MagnificationSpec spec) { if (mEnabled) { if (DEBUG_SET_MAGNIFICATION_SPEC) { diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 3b80f555d458..83367f3f83b4 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1931,6 +1931,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { /** * Remove a package from the full-data queue. */ + @GuardedBy("mQueueLock") private void dequeueFullBackupLocked(String packageName) { final int N = mFullBackupQueue.size(); for (int i = N - 1; i >= 0; i--) { diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java index 60f204dd4bbc..0c0ce8dd5174 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DeviceAdminServiceController.java @@ -193,6 +193,7 @@ public class DeviceAdminServiceController { } } + @GuardedBy("mLock") private void disconnectServiceOnUserLocked(int userId, @NonNull String actionForLog) { final DevicePolicyServiceConnection conn = mConnections.get(userId); if (conn != null) { diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 953a79f625e6..7d4be9b6a061 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -10221,6 +10221,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { mInjector.registerContentObserver(mDefaultImeChanged, false, this, UserHandle.USER_ALL); } + @GuardedBy("DevicePolicyManagerService.this") private void addPendingChangeByOwnerLocked(int userId) { mUserIdsWithPendingChangesByOwner.add(userId); } diff --git a/services/net/java/android/net/apf/ApfFilter.java b/services/net/java/android/net/apf/ApfFilter.java index 7d9736ed3fe5..d19043223416 100644 --- a/services/net/java/android/net/apf/ApfFilter.java +++ b/services/net/java/android/net/apf/ApfFilter.java @@ -1068,6 +1068,7 @@ public class ApfFilter { mLastInstallEvent.flags = ApfProgramEvent.flagsFor(mIPv4Address != null, mMulticastFilter); } + @GuardedBy("this") private void logApfProgramEventLocked(long now) { if (mLastInstallEvent == null) { return; diff --git a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java index 49a1e79fd71e..8fbc01ea4493 100644 --- a/services/net/java/android/net/ip/RouterAdvertisementDaemon.java +++ b/services/net/java/android/net/ip/RouterAdvertisementDaemon.java @@ -268,6 +268,7 @@ public class RouterAdvertisementDaemon { mUnicastResponder = null; } + @GuardedBy("mLock") private void assembleRaLocked() { final ByteBuffer ra = ByteBuffer.wrap(mRA); ra.order(ByteOrder.BIG_ENDIAN); diff --git a/services/print/java/com/android/server/print/RemotePrintSpooler.java b/services/print/java/com/android/server/print/RemotePrintSpooler.java index ba5dde04897f..c1c32c28cb6b 100644 --- a/services/print/java/com/android/server/print/RemotePrintSpooler.java +++ b/services/print/java/com/android/server/print/RemotePrintSpooler.java @@ -596,6 +596,7 @@ final class RemotePrintSpooler { } } + @GuardedBy("mLock") private void bindLocked() throws TimeoutException, InterruptedException { while (mIsBinding) { mLock.wait(); diff --git a/services/usage/java/com/android/server/usage/AppStandbyController.java b/services/usage/java/com/android/server/usage/AppStandbyController.java index cc21199edfd9..f0aeb62d0a0a 100644 --- a/services/usage/java/com/android/server/usage/AppStandbyController.java +++ b/services/usage/java/com/android/server/usage/AppStandbyController.java @@ -539,6 +539,7 @@ public class AppStandbyController { } } + @GuardedBy("mAppIdleLock") @StandbyBuckets int getBucketForLocked(String packageName, int userId, long elapsedRealtime) { int bucketIndex = mAppIdleHistory.getThresholdIndex(packageName, userId, diff --git a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java index 4b2d9b9adbbb..43f189b26dfa 100644 --- a/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java +++ b/services/usb/java/com/android/server/usb/UsbProfileGroupSettingsManager.java @@ -314,6 +314,7 @@ class UsbProfileGroupSettingsManager { * Upgrade any single-user settings from {@link #sSingleUserSettingsFile}. * Should only by called by owner. */ + @GuardedBy("mLock") private void upgradeSingleUserLocked() { if (sSingleUserSettingsFile.exists()) { mDevicePreferenceMap.clear(); @@ -347,6 +348,7 @@ class UsbProfileGroupSettingsManager { } } + @GuardedBy("mLock") private void readSettingsLocked() { if (DEBUG) Slog.v(TAG, "readSettingsLocked()"); @@ -386,6 +388,7 @@ class UsbProfileGroupSettingsManager { * <p>In the uncommon case that the system crashes in between the scheduling and the write the * update is lost.</p> */ + @GuardedBy("mLock") private void scheduleWriteSettingsLocked() { if (mIsWriteSettingsScheduled) { return; @@ -869,6 +872,7 @@ class UsbProfileGroupSettingsManager { return null; } + @GuardedBy("mLock") private boolean clearCompatibleMatchesLocked(@NonNull UserPackage userPackage, @NonNull DeviceFilter filter) { ArrayList<DeviceFilter> keysToRemove = new ArrayList<>(); @@ -892,6 +896,7 @@ class UsbProfileGroupSettingsManager { return !keysToRemove.isEmpty(); } + @GuardedBy("mLock") private boolean clearCompatibleMatchesLocked(@NonNull UserPackage userPackage, @NonNull AccessoryFilter filter) { ArrayList<AccessoryFilter> keysToRemove = new ArrayList<>(); @@ -915,6 +920,7 @@ class UsbProfileGroupSettingsManager { return !keysToRemove.isEmpty(); } + @GuardedBy("mLock") private boolean handlePackageAddedLocked(UserPackage userPackage, ActivityInfo aInfo, String metaDataName) { XmlResourceParser parser = null; diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java index 1edc46967495..c1a75912425a 100644 --- a/services/usb/java/com/android/server/usb/UsbService.java +++ b/services/usb/java/com/android/server/usb/UsbService.java @@ -236,6 +236,7 @@ public class UsbService extends IUsbManager.Stub { * * @return Iff the caller is in the current user's profile group */ + @GuardedBy("mLock") private boolean isCallerInCurrentUserProfileGroupLocked() { int userIdInt = UserHandle.getCallingUserId(); |