From e8b1a8986a3ff538fd00aae777fc852abd473b5b Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Mon, 25 Jul 2022 22:28:13 +0000 Subject: [PATCH] Avoid the suppression of an errorprone warning Lock mService.mSpManager in initializeStorageWithCredential() so that GuardedBy warnings don't have to be suppressed in that method anymore. Test: m FrameworksServicesTests RUN_ERROR_PRONE=true Test: atest LockSettingsServiceTests Change-Id: I7451a7d32c3feb6c1ac40371cdb6f24f7b1fdd6d --- .../com/android/server/locksettings/LockSettingsService.java | 3 ++- .../server/locksettings/LockSettingsServiceTests.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 804315cddabd3..2f6fd005fb824 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -234,7 +234,8 @@ public class LockSettingsService extends ILockSettings.Stub { protected final UserManager mUserManager; private final IStorageManager mStorageManager; private final IActivityManager mActivityManager; - private final SyntheticPasswordManager mSpManager; + @VisibleForTesting + protected final SyntheticPasswordManager mSpManager; private final KeyStore mKeyStore; private final java.security.KeyStore mJavaKeyStore; diff --git a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java index 20cc42cd9c769..9458b9bd5be08 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTests.java @@ -504,11 +504,12 @@ public class LockSettingsServiceTests extends BaseLockSettingsServiceTests { badCredential, userId, 0 /* flags */).getResponseCode()); } - @SuppressWarnings("GuardedBy") // for initializeSyntheticPasswordLocked private void initializeStorageWithCredential(int userId, LockscreenCredential credential) throws RemoteException { assertEquals(0, mGateKeeperService.getSecureUserId(userId)); - mService.initializeSyntheticPasswordLocked(credential, userId); + synchronized (mService.mSpManager) { + mService.initializeSyntheticPasswordLocked(credential, userId); + } assertNotEquals(0, mGateKeeperService.getSecureUserId(userId)); } }