Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51a0475c authored by Eric Biggers's avatar Eric Biggers Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I038600e5177845571e80d65c24eb90278320e295
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 42ad676a 7ec6e27c

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

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase { 
        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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class StorageWizardMoveConfirm extends StorageWizardBase { 
        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)) {