PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use isCeStorageUnlocked() in storage wizards

Browse Source 
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
This commit is contained in:
Eric Biggers
2023-10-31 21:59:31 +00:00
parent e8df63f148
commit 8f363f7290
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
View File

@@ -101,7 +101,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
final LockPatternUtils lpu = new LockPatternUtils(this); final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) { if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) { for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
if (StorageManager.isUserKeyUnlocked(user.id)) { if (StorageManager.isCeStorageUnlocked(user.id)) {
continue; continue;
} }
if (!lpu.isSecure(user.id)) { if (!lpu.isSecure(user.id)) {

2
src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
View File

@@ -83,7 +83,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase {
final LockPatternUtils lpu = new LockPatternUtils(this); final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) { if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) { for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
if (StorageManager.isUserKeyUnlocked(user.id)) { if (StorageManager.isCeStorageUnlocked(user.id)) {
continue; continue;
} }
if (!lpu.isSecure(user.id)) { if (!lpu.isSecure(user.id)) {