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

Merge "Fix incorrect password attempts messaging on headless" into main

Browse Source
This commit is contained in:
Kholoud Mohamed
2024-04-19 14:47:57 +00:00
committed by Android (Google) Code Review
parent 1227eb311f 85c38bc078
commit 0480d7c0a1
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
View File

@@ -27,6 +27,7 @@ import android.app.KeyguardManager;
import android.app.RemoteLockscreenValidationSession;
import android.app.admin.DevicePolicyManager;
import android.app.admin.ManagedSubscriptionsPolicy;
import android.app.admin.flags.Flags;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -374,7 +375,14 @@ public abstract class ConfirmDeviceCredentialBaseFragment extends InstrumentedFr
private int getUserTypeForWipe() {
final UserInfo userToBeWiped = mUserManager.getUserInfo(
mDevicePolicyManager.getProfileWithMinimumFailedPasswordsForWipe(mEffectiveUserId));
if (userToBeWiped == null || userToBeWiped.isPrimary()) {
UserHandle primaryUser = UserHandle.SYSTEM;
if (Flags.headlessSingleUserFixes()) {
UserHandle mainUser = mUserManager.getMainUser();
if (mainUser != null ) {
primaryUser = mainUser;
}
}
if (userToBeWiped == null || userToBeWiped.getUserHandle().equals(primaryUser)) {
return USER_TYPE_PRIMARY;
} else if (userToBeWiped.isManagedProfile()) {
return USER_TYPE_MANAGED_PROFILE;