PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Unlock non-secure users automatically (2/2)" into main

Browse Source
This commit is contained in:
Eric Biggers
2023-10-18 23:50:43 +00:00
committed by Gerrit Code Review
parent 0481d6a318 ae0261e220
commit fcaf0aceeb
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
View File

@@ -30,6 +30,7 @@ import android.util.Log;
import android.view.View;
import android.widget.Toast;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -97,10 +98,19 @@ public class StorageWizardMigrateConfirm extends StorageWizardBase {
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
if (!StorageManager.isUserKeyUnlocked(user.id)) {
Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
if (StorageManager.isUserKeyUnlocked(user.id)) {
continue;
}
if (!lpu.isSecure(user.id)) {
Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ "automatic unlock");
lpu.unlockUserKeyIfUnsecured(user.id);
} else {
Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =

14
src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
View File

@@ -33,6 +33,7 @@ import android.util.Log;
import android.view.View;
import com.android.internal.util.Preconditions;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.password.ChooseLockSettingsHelper;
@@ -79,10 +80,19 @@ public class StorageWizardMoveConfirm extends StorageWizardBase {
@Override
public void onNavigateNext(View view) {
// Ensure that all users are unlocked so that we can move their data
final LockPatternUtils lpu = new LockPatternUtils(this);
if (StorageManager.isFileEncrypted()) {
for (UserInfo user : getSystemService(UserManager.class).getUsers()) {
if (!StorageManager.isUserKeyUnlocked(user.id)) {
Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
if (StorageManager.isUserKeyUnlocked(user.id)) {
continue;
}
if (!lpu.isSecure(user.id)) {
Log.d(TAG, "Unsecured user " + user.id + " is currently locked; attempting "
+ "automatic unlock");
lpu.unlockUserKeyIfUnsecured(user.id);
} else {
Log.d(TAG, "Secured user " + user.id + " is currently locked; requesting "
+ "manual unlock");
final CharSequence description = TextUtils.expandTemplate(
getText(R.string.storage_wizard_move_unlock), user.name);
final ChooseLockSettingsHelper.Builder builder =