diff options
5 files changed, 10 insertions, 1 deletions
diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java index 5b7332d0c636..db87943bf2bf 100644 --- a/services/autofill/java/com/android/server/autofill/Session.java +++ b/services/autofill/java/com/android/server/autofill/Session.java @@ -2954,11 +2954,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState mMetricsLogger.write(newLogMaker(category)); } + @GuardedBy("mLock") private void logAuthenticationStatusLocked(int requestId, int status) { addTaggedDataToRequestLogLocked(requestId, MetricsEvent.FIELD_AUTOFILL_AUTHENTICATION_STATUS, status); } + @GuardedBy("mLock") private void addTaggedDataToRequestLogLocked(int requestId, int tag, @Nullable Object value) { final LogMaker requestLog = mRequestLogs.get(requestId); if (requestLog == null) { diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 07f3e176fc93..cacdccb2dc4e 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -8579,7 +8579,7 @@ public class PackageManagerService extends IPackageManager.Stub * Traces a package scan. * @see #scanPackageLI(File, int, int, long, UserHandle) */ - @GuardedBy("mInstallLock") + @GuardedBy({"mInstallLock", "mPackages"}) private PackageParser.Package scanPackageTracedLI(File scanFile, final int parseFlags, int scanFlags, long currentTime, UserHandle user) throws PackageManagerException { Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage [" + scanFile.toString() + "]"); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index c131858d3ffe..eb12ef4d2cc0 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2203,6 +2203,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { * @return the user password metrics, or {@code null} if none have been associated with * the user yet (for example, if the device has booted but not been unlocked). */ + @GuardedBy("getLockObject()") PasswordMetrics getUserPasswordMetricsLocked(int userHandle) { return mUserPasswordMetrics.get(userHandle); } @@ -3972,6 +3973,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { * be the correct one upon boot. * This should be called whenever the password or the admin policies have changed. */ + @GuardedBy("getLockObject()") private void updatePasswordValidityCheckpointLocked(int userHandle, boolean parent) { final int credentialOwner = getCredentialOwner(userHandle, parent); DevicePolicyData policy = getUserData(credentialOwner); @@ -12313,6 +12315,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } /** Pauses security and network logging if there are unaffiliated users on the device */ + @GuardedBy("getLockObject()") private void maybePauseDeviceWideLoggingLocked() { if (!areAllUsersAffiliatedWithDeviceLocked()) { Slog.i(LOG_TAG, "There are unaffiliated users, security and network logging will be " @@ -12325,6 +12328,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } /** Resumes security and network logging (if they are enabled) if all users are affiliated */ + @GuardedBy("getLockObject()") private void maybeResumeDeviceWideLoggingLocked() { if (areAllUsersAffiliatedWithDeviceLocked()) { final long ident = mInjector.binderClearCallingIdentity(); @@ -12340,6 +12344,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } /** Deletes any security and network logs that might have been collected so far */ + @GuardedBy("getLockObject()") private void discardDeviceWideLogsLocked() { mSecurityLogMonitor.discardLogs(); if (mNetworkLogger != null) { diff --git a/services/usage/java/com/android/server/usage/AppTimeLimitController.java b/services/usage/java/com/android/server/usage/AppTimeLimitController.java index e7c54d8415d7..5916b04c079a 100644 --- a/services/usage/java/com/android/server/usage/AppTimeLimitController.java +++ b/services/usage/java/com/android/server/usage/AppTimeLimitController.java @@ -168,6 +168,7 @@ public class AppTimeLimitController { } /** Returns an existing UserData object for the given userId, or creates one */ + @GuardedBy("mLock") private UserData getOrCreateUserDataLocked(int userId) { UserData userData = mUsers.get(userId); if (userData == null) { diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java index de1771690e60..7c22613664a5 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -670,6 +670,7 @@ public class SoundTriggerService extends SystemService { /** * Disconnect from the service, but allow to re-connect when new operations are triggered. */ + @GuardedBy("mRemoteServiceLock") private void disconnectLocked() { if (mService != null) { try { |