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 am: 7ec6e27c64

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094

Change-Id: I6b244829ad28cd3175def5feb7ced27c6453d2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eric Biggers
2023-11-29 03:43:14 +00:00
committed by Automerger Merge Worker
parent 9827ddae2a 7ec6e27c64
commit 7f849bdaac
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)) {