diff options
3 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java index 8547c96e13af..09d0bc76466c 100644 --- a/services/core/java/com/android/server/locksettings/LockSettingsService.java +++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java @@ -346,17 +346,17 @@ public class LockSettingsService extends ILockSettings.Stub { @Override public void onUserStarting(@NonNull TargetUser user) { - mLockSettingsService.onStartUser(user.getUserIdentifier()); + mLockSettingsService.onUserStarting(user.getUserIdentifier()); } @Override public void onUserUnlocking(@NonNull TargetUser user) { - mLockSettingsService.onUnlockUser(user.getUserIdentifier()); + mLockSettingsService.onUserUnlocking(user.getUserIdentifier()); } @Override public void onUserStopped(@NonNull TargetUser user) { - mLockSettingsService.onCleanupUser(user.getUserIdentifier()); + mLockSettingsService.onUserStopped(user.getUserIdentifier()); } } @@ -778,7 +778,7 @@ public class LockSettingsService extends ILockSettings.Stub { } @VisibleForTesting - void onCleanupUser(int userId) { + void onUserStopped(int userId) { hideEncryptionNotification(new UserHandle(userId)); // User is stopped with its CE key evicted. Restore strong auth requirement to the default // flags after boot since stopping and restarting a user later is equivalent to rebooting @@ -790,7 +790,7 @@ public class LockSettingsService extends ILockSettings.Stub { } } - private void onStartUser(final int userId) { + private void onUserStarting(final int userId) { maybeShowEncryptionNotificationForUser(userId, "user started"); } @@ -826,7 +826,7 @@ public class LockSettingsService extends ILockSettings.Stub { } } - private void onUnlockUser(final int userId) { + private void onUserUnlocking(final int userId) { // Perform tasks which require locks in LSS on a handler, as we are callbacks from // ActivityManager.unlockUser() mHandler.post(new Runnable() { diff --git a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java index dee77806e4f3..37a6d22f038b 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/SyntheticPasswordTests.java @@ -781,7 +781,7 @@ public class SyntheticPasswordTests extends BaseLockSettingsServiceTests { password, PRIMARY_USER_ID, 0 /* flags */).getResponseCode()); assertTrue(mLocalService.isEscrowTokenActive(handle, PRIMARY_USER_ID)); - mService.onCleanupUser(PRIMARY_USER_ID); + mService.onUserStopped(PRIMARY_USER_ID); assertNull(mLocalService.getUserPasswordMetrics(PRIMARY_USER_ID)); assertTrue(mLocalService.unlockUserWithToken(handle, token, PRIMARY_USER_ID)); diff --git a/services/tests/servicestests/src/com/android/server/locksettings/WeakEscrowTokenTests.java b/services/tests/servicestests/src/com/android/server/locksettings/WeakEscrowTokenTests.java index 2c9ba34e850f..e8b7ad7e7389 100644 --- a/services/tests/servicestests/src/com/android/server/locksettings/WeakEscrowTokenTests.java +++ b/services/tests/servicestests/src/com/android/server/locksettings/WeakEscrowTokenTests.java @@ -169,7 +169,7 @@ public class WeakEscrowTokenTests extends BaseLockSettingsServiceTests{ assertTrue(mService.isWeakEscrowTokenActive(handle, PRIMARY_USER_ID)); assertTrue(mService.isWeakEscrowTokenValid(handle, token, PRIMARY_USER_ID)); - mService.onCleanupUser(PRIMARY_USER_ID); + mService.onUserStopped(PRIMARY_USER_ID); assertNull(mLocalService.getUserPasswordMetrics(PRIMARY_USER_ID)); assertTrue(mLocalService.unlockUserWithToken(handle, token, PRIMARY_USER_ID)); |