diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-10-31 21:59:31 +0000 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2023-10-31 21:59:31 +0000 |
| commit | 8f363f72904f9189473ac3be3663c66732308938 (patch) | |
| tree | f547bb9632062dd39bb9867204fdb28151725b17 | |
| parent | e8df63f148e9d4dd85f7879170f1487c1f7ffbac (diff) | |
| download | Settings-8f363f72904f9189473ac3be3663c66732308938.tar.gz | |
Use isCeStorageUnlocked() in storage wizards
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
StorageWizardMigrateConfirm and StorageWizardMoveConfirm to use the new
name. No change in behavior.
Bug: 306204742
Flag: exempt, mechanical refactoring
Test: presubmit
Change-Id: I5ffdd8ce048b1bc9e6161bf4fb546796765e5842
| -rw-r--r-- | src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java | 2 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index 1e0c184613e..2018898373c 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java @@ -101,7 +101,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { final LockPatternUtils lpu = new LockPatternUtils(this); if (StorageManager.isFileEncrypted()) { for (UserInfo user : getSystemService(UserManager.class).getUsers()) { - if (StorageManager.isUserKeyUnlocked(user.id)) { + if (StorageManager.isCeStorageUnlocked(user.id)) { continue; } if (!lpu.isSecure(user.id)) { diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java index bf16ab0f972..f55f8221f7c 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java @@ -83,7 +83,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase { final LockPatternUtils lpu = new LockPatternUtils(this); if (StorageManager.isFileEncrypted()) { for (UserInfo user : getSystemService(UserManager.class).getUsers()) { - if (StorageManager.isUserKeyUnlocked(user.id)) { + if (StorageManager.isCeStorageUnlocked(user.id)) { continue; } if (!lpu.isSecure(user.id)) { |