| commit | e4f1aa8098d6555b924972c9d7c6743a08896e07 | [log] [tgz] |
|---|---|---|
| author | Eric Biggers <ebiggers@google.com> | Wed Nov 29 04:09:41 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Nov 29 04:09:41 2023 +0000 |
| tree | 0dd01272ed53211aafe684c3388d2d39f3e3329a | |
| parent | 875ae1db39ccdb16968b3daf8896b58b9deb3a89 [diff] | |
| parent | 51a0475c4430643fd3c400db57df7d621490b186 [diff] |
Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64 am: 51a0475c44 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2807094 Change-Id: I3dc5181c72a6e99964b5681ec275c35eece2e6ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java index 1e0c184..2018898 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -101,7 +101,7 @@ 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 bf16ab0..f55f822 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -83,7 +83,7 @@ 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)) {