diff options
| -rw-r--r-- | services/core/java/com/android/server/locksettings/LockSettingsService.java | 3 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/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 804315cddabd..2f6fd005fb82 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 20cc42cd9c76..9458b9bd5be0 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)); } } |