commit 75a49e0abb1891f48f06d7aaf8dc55a6faf51b35
author Roshan Pius <rpius@google.com> Thu Nov 30 17:29:37 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 30 17:29:37 2023 +0000
tree 49d83cdfac51650a15bafa59a9b8fb0b40534f07
parent 7ec6e27c644fd8ef0a1b6ab7fd5813d0dc3e9ddb
parent 0d11f492f7e23e5958a15c69d0c0c2bd7044f9bc

Merge "settings: Remove @hide NFC API usage" into main

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