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

Commit 7ec6e27c authored by Eric Biggers's avatar Eric Biggers Committed by Gerrit Code Review
Browse files

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

parents 3c569b53 8f363f72

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