From 8f363f72904f9189473ac3be3663c66732308938 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 31 Oct 2023 21:59:31 +0000 Subject: [PATCH] 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 --- .../settings/deviceinfo/StorageWizardMigrateConfirm.java | 2 +- .../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)) {