commit 7f849bdaac918f992d60193a1c3a91b14ed276d3
author Eric Biggers <ebiggers@google.com> Wed Nov 29 03:43:14 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Nov 29 03:43:14 2023 +0000
tree 685d9388b2a8b83de509f31526cf876d338b6b09
parent 9827ddae2a4c19f5247580ced740b7a8057b03aa
parent 7ec6e27c644fd8ef0a1b6ab7fd5813d0dc3e9ddb

Merge "Use isCeStorageUnlocked() in storage wizards" into main am: 7ec6e27c64

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>

src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java

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)) {

src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java

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)) {