Merge "Frameworks: Annotate trivial @GuardedBy in services" (6c1c842d) · Commits · e / os / android_frameworks_base

services/autofill/java/com/android/server/autofill/Session.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2981,11 +2981,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	mMetricsLogger.write(newLogMaker(category));		mMetricsLogger.write(newLogMaker(category));
	}		}

			@GuardedBy("mLock")
	private void logAuthenticationStatusLocked(int requestId, int status) {		private void logAuthenticationStatusLocked(int requestId, int status) {
	addTaggedDataToRequestLogLocked(requestId,		addTaggedDataToRequestLogLocked(requestId,
	MetricsEvent.FIELD_AUTOFILL_AUTHENTICATION_STATUS, status);		MetricsEvent.FIELD_AUTOFILL_AUTHENTICATION_STATUS, status);
	}		}

			@GuardedBy("mLock")
	private void addTaggedDataToRequestLogLocked(int requestId, int tag, @Nullable Object value) {		private void addTaggedDataToRequestLogLocked(int requestId, int tag, @Nullable Object value) {
	final LogMaker requestLog = mRequestLogs.get(requestId);		final LogMaker requestLog = mRequestLogs.get(requestId);
	if (requestLog == null) {		if (requestLog == null) {

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8579,7 +8579,7 @@ public class PackageManagerService extends IPackageManager.Stub
	* Traces a package scan.		* Traces a package scan.
	* @see #scanPackageLI(File, int, int, long, UserHandle)		* @see #scanPackageLI(File, int, int, long, UserHandle)
	*/		*/
	@GuardedBy("mInstallLock")		@GuardedBy({"mInstallLock", "mPackages"})
	private PackageParser.Package scanPackageTracedLI(File scanFile, final int parseFlags,		private PackageParser.Package scanPackageTracedLI(File scanFile, final int parseFlags,
	int scanFlags, long currentTime, UserHandle user) throws PackageManagerException {		int scanFlags, long currentTime, UserHandle user) throws PackageManagerException {
	Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage [" + scanFile.toString() + "]");		Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "scanPackage [" + scanFile.toString() + "]");

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −0

services/usage/java/com/android/server/usage/AppTimeLimitController.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -168,6 +168,7 @@ public class AppTimeLimitController {
	}		}

	/** Returns an existing UserData object for the given userId, or creates one */		/** Returns an existing UserData object for the given userId, or creates one */
			@GuardedBy("mLock")
	private UserData getOrCreateUserDataLocked(int userId) {		private UserData getOrCreateUserDataLocked(int userId) {
	UserData userData = mUsers.get(userId);		UserData userData = mUsers.get(userId);
	if (userData == null) {		if (userData == null) {

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -670,6 +670,7 @@ public class SoundTriggerService extends SystemService {
	/**		/**
	* Disconnect from the service, but allow to re-connect when new operations are triggered.		* Disconnect from the service, but allow to re-connect when new operations are triggered.
	*/		*/
			@GuardedBy("mRemoteServiceLock")
	private void disconnectLocked() {		private void disconnectLocked() {
	if (mService != null) {		if (mService != null) {
	try {		try {

Original line number	Original line	Diff line number	Diff line
	@@ -2210,6 +2210,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	* @return the user password metrics, or {@code null} if none have been associated with		* @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).		* the user yet (for example, if the device has booted but not been unlocked).
	*/		*/
			@GuardedBy("getLockObject()")
	PasswordMetrics getUserPasswordMetricsLocked(int userHandle) {		PasswordMetrics getUserPasswordMetricsLocked(int userHandle) {
	return mUserPasswordMetrics.get(userHandle);		return mUserPasswordMetrics.get(userHandle);
	}		}
	@@ -3990,6 +3991,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	* be the correct one upon boot.		* be the correct one upon boot.
	* This should be called whenever the password or the admin policies have changed.		* This should be called whenever the password or the admin policies have changed.
	*/		*/
			@GuardedBy("getLockObject()")
	private void updatePasswordValidityCheckpointLocked(int userHandle, boolean parent) {		private void updatePasswordValidityCheckpointLocked(int userHandle, boolean parent) {
	final int credentialOwner = getCredentialOwner(userHandle, parent);		final int credentialOwner = getCredentialOwner(userHandle, parent);
	DevicePolicyData policy = getUserData(credentialOwner);		DevicePolicyData policy = getUserData(credentialOwner);
	@@ -12331,6 +12333,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	}		}

	/** Pauses security and network logging if there are unaffiliated users on the device */		/** Pauses security and network logging if there are unaffiliated users on the device */
			@GuardedBy("getLockObject()")
	private void maybePauseDeviceWideLoggingLocked() {		private void maybePauseDeviceWideLoggingLocked() {
	if (!areAllUsersAffiliatedWithDeviceLocked()) {		if (!areAllUsersAffiliatedWithDeviceLocked()) {
	Slog.i(LOG_TAG, "There are unaffiliated users, security and network logging will be "		Slog.i(LOG_TAG, "There are unaffiliated users, security and network logging will be "
	@@ -12343,6 +12346,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	}		}

	/** Resumes security and network logging (if they are enabled) if all users are affiliated */		/** Resumes security and network logging (if they are enabled) if all users are affiliated */
			@GuardedBy("getLockObject()")
	private void maybeResumeDeviceWideLoggingLocked() {		private void maybeResumeDeviceWideLoggingLocked() {
	if (areAllUsersAffiliatedWithDeviceLocked()) {		if (areAllUsersAffiliatedWithDeviceLocked()) {
	final long ident = mInjector.binderClearCallingIdentity();		final long ident = mInjector.binderClearCallingIdentity();
	@@ -12358,6 +12362,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
	}		}

	/** Deletes any security and network logs that might have been collected so far */		/** Deletes any security and network logs that might have been collected so far */
			@GuardedBy("getLockObject()")
	private void discardDeviceWideLogsLocked() {		private void discardDeviceWideLogsLocked() {
	mSecurityLogMonitor.discardLogs();		mSecurityLogMonitor.discardLogs();
	if (mNetworkLogger != null) {		if (mNetworkLogger != null) {