From 45f71ab1ceec4da3dab9da0c52d7f71823da7768 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 9 Jan 2024 18:10:17 +0000 Subject: [PATCH] Use isCeStorageUnlocked() in ConfirmDeviceCredentialActivity isUserKeyUnlocked() is being renamed to isCeStorageUnlocked() to make it clear what it does (considering that there are many types of user keys). Temporarily, the method exists under both names. Change ConfirmDeviceCredentialActivity to use the new name. No change in behavior. Bug: 306204742 Flag: exempt, mechanical refactoring Test: presubmit Change-Id: I9a3f686b57cfbf99b6c915565e5ecc38ddfe9b22 --- .../settings/password/ConfirmDeviceCredentialActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java index 2a299c55ac2..4a760add79e 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java +++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java @@ -417,7 +417,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity { // the profile user using verifyTiedProfileChallenge. Biometrics can still be used if // the user is stopped with delayed locking (i.e., with storage unlocked), so the user // state (whether the user is in the RUNNING_UNLOCKED state) should not be relied upon. - return !StorageManager.isUserKeyUnlocked(userId); + return !StorageManager.isCeStorageUnlocked(userId); } return !mUserManager.isUserUnlocked(userId); }