Merge "Use isCeStorageUnlocked() in ConfirmDeviceCredentialActivity" into main

This commit is contained in:
Eric Biggers
2024-01-09 20:01:38 +00:00
committed by Android (Google) Code Review

View File

@@ -417,7 +417,7 @@ public class ConfirmDeviceCredentialActivity extends FragmentActivity {
// the profile user using verifyTiedProfileChallenge. Biometrics can still be used if // 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 // 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. // 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); return !mUserManager.isUserUnlocked(userId);
} }