summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-10-19 19:47:17 +0000
committer Eric Biggers <ebiggers@google.com> 2023-10-26 01:38:15 +0000
commited4b01788537a358b05143c0beea9bfdabdaf7fa (patch)
treeef8eecf436de08d989851fe1e5304e9da78c34a9
parent04e59b174f08920d7b39982b8a4b13d2385928ea (diff)
Use isCeStorageUnlocked() in AppDataRollbackHelper
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 AppDataRollbackHelper to use the new name. No change in behavior. Bug: 306204742 Flag: exempt, mechanical refactoring Test: presubmit Change-Id: Iab2ca2fdd968bd10dc6e67424d61b21ab66922ea
-rw-r--r--services/core/java/com/android/server/rollback/AppDataRollbackHelper.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java b/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
index 7b0fe9a9abc7..a01bac688fbf 100644
--- a/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
+++ b/services/core/java/com/android/server/rollback/AppDataRollbackHelper.java
@@ -266,10 +266,10 @@ public class AppDataRollbackHelper {
}
/**
- * @return {@code true} iff. {@code userId} is locked on an FBE device.
+ * @return {@code true} iff the credential-encrypted storage for {@code userId} is locked.
*/
@VisibleForTesting
public boolean isUserCredentialLocked(int userId) {
- return StorageManager.isFileEncrypted() && !StorageManager.isUserKeyUnlocked(userId);
+ return StorageManager.isFileEncrypted() && !StorageManager.isCeStorageUnlocked(userId);
}
}