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

Merge "Use isCeStorageUnlocked() in storage wizards" into main

Browse Source
This commit is contained in:
Eric Biggers
2023-11-29 02:27:02 +00:00
committed by Gerrit Code Review
parent 3c569b5379 8f363f7290
commit 7ec6e27c64
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)) {